diff options
author | Tony Lindgren <tony@atomide.com> | 2021-03-08 12:34:12 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2021-03-08 12:34:12 +0300 |
commit | 4c9f4865f4604744d4f1a43db22ac6ec9dc8e587 (patch) | |
tree | 46abf93c9b90b880464772ce7d23309ee3616b91 /drivers/fpga/fpga-bridge.c | |
parent | effe89e40037038db7711bdab5d3401fe297d72c (diff) | |
parent | 77335a040178a0456d4eabc8bf17a7ca3ee4a327 (diff) | |
download | linux-4c9f4865f4604744d4f1a43db22ac6ec9dc8e587.tar.xz |
Merge branch 'fixes-rc2' into fixes
Diffstat (limited to 'drivers/fpga/fpga-bridge.c')
-rw-r--r-- | drivers/fpga/fpga-bridge.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c index 2deccacc3aa7..e9266b2a357f 100644 --- 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 spinlock_t bridge_list_lock; +static DEFINE_SPINLOCK(bridge_list_lock); /** * 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) { - 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); |