Merge tag 'trace-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[J-linux.git] / drivers / fpga / fpga-bridge.c

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 2deccacc3aa759ad8dc3761d404a38cceb1034e0..e9266b2a357f6029cd63f0edf8ea6722eb1649cd 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -17,7 +17,7 @@ static DEFINE_IDA(fpga_bridge_ida);
 static struct class *fpga_bridge_class;
 
 /* Lock for adding/removing bridges to linked lists*/
 static struct class *fpga_bridge_class;
 
 /* Lock for adding/removing bridges to linked lists*/

-static spinlock_t bridge_list_lock;
+static DEFINE_SPINLOCK(bridge_list_lock);

 
 /**
  * fpga_bridge_enable - Enable transactions on the bridge
 
 /**
  * fpga_bridge_enable - Enable transactions on the bridge


@@ -479,8 +479,6 @@ static void fpga_bridge_dev_release(struct device *dev)
 
 static int __init fpga_bridge_dev_init(void)
 {
 
 static int __init fpga_bridge_dev_init(void)
 {

-       spin_lock_init(&bridge_list_lock);
-

        fpga_bridge_class = class_create(THIS_MODULE, "fpga_bridge");
        if (IS_ERR(fpga_bridge_class))
                return PTR_ERR(fpga_bridge_class);
        fpga_bridge_class = class_create(THIS_MODULE, "fpga_bridge");
        if (IS_ERR(fpga_bridge_class))
                return PTR_ERR(fpga_bridge_class);