Merge tag 'pstore-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

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

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 33ee83e6373cfd783e052c30a805dbf8c39a1dbe..9651aa56244a562e0daadb8fd2de230ac7d99e9a 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -27,7 +27,7 @@ static DEFINE_IDA(fpga_bridge_ida);
 static struct class *fpga_bridge_class;
 
 /* Lock for adding/removing bridges to linked lists*/
-spinlock_t bridge_list_lock;
+static spinlock_t bridge_list_lock;
 
 static int fpga_bridge_of_node_match(struct device *dev, const void *data)
 {
@@ -146,11 +146,9 @@ EXPORT_SYMBOL_GPL(fpga_bridge_put);
 int fpga_bridges_enable(struct list_head *bridge_list)
 {
        struct fpga_bridge *bridge;
-       struct list_head *node;
        int ret;
 
-       list_for_each(node, bridge_list) {
-               bridge = list_entry(node, struct fpga_bridge, node);
+       list_for_each_entry(bridge, bridge_list, node) {
                ret = fpga_bridge_enable(bridge);
                if (ret)
                        return ret;
@@ -172,11 +170,9 @@ EXPORT_SYMBOL_GPL(fpga_bridges_enable);
 int fpga_bridges_disable(struct list_head *bridge_list)
 {
        struct fpga_bridge *bridge;
-       struct list_head *node;
        int ret;
 
-       list_for_each(node, bridge_list) {
-               bridge = list_entry(node, struct fpga_bridge, node);
+       list_for_each_entry(bridge, bridge_list, node) {
                ret = fpga_bridge_disable(bridge);
                if (ret)
                        return ret;
@@ -196,13 +192,10 @@ EXPORT_SYMBOL_GPL(fpga_bridges_disable);
  */
 void fpga_bridges_put(struct list_head *bridge_list)
 {
-       struct fpga_bridge *bridge;
-       struct list_head *node, *next;
+       struct fpga_bridge *bridge, *next;
        unsigned long flags;
 
-       list_for_each_safe(node, next, bridge_list) {
-               bridge = list_entry(node, struct fpga_bridge, node);
-
+       list_for_each_entry_safe(bridge, next, bridge_list, node) {
                fpga_bridge_put(bridge);
 
                spin_lock_irqsave(&bridge_list_lock, flags);