ipv4: convert dst_metrics.refcnt from atomic_t to refcount_t

[mirror_ubuntu-artful-kernel.git] / drivers / fpga / altera-hps2fpga.c

diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index 3066b805f2d072fd2731a785a6df408e42820dcd..08c0ecb7d109fc998a2d7b089901d21e70e00063 100644 (file)
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -66,7 +66,7 @@ static int alt_hps2fpga_enable_show(struct fpga_bridge *bridge)
 
 /* The L3 REMAP register is write only, so keep a cached value. */
 static unsigned int l3_remap_shadow;
-static spinlock_t l3_remap_lock;
+static DEFINE_SPINLOCK(l3_remap_lock);
 
 static int _alt_hps2fpga_enable_set(struct altera_hps2fpga_data *priv,
                                    bool enable)
@@ -171,8 +171,6 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
                return -EBUSY;
        }
 
-       spin_lock_init(&l3_remap_lock);
-
        if (!of_property_read_u32(dev->of_node, "bridge-enable", &enable)) {
                if (enable > 1) {
                        dev_warn(dev, "invalid bridge-enable %u > 1\n", enable);