1 files changed, 40 insertions, 21 deletions

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index dbeba45a031e..6a1a0572275e 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -16,6 +16,7 @@
 #include <linux/kthread.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/mutex.h>
 #include <linux/freezer.h>
 #include <asm/atomic.h>
 
@@ -115,7 +116,7 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
 
 static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci)
 {
-        return (CSR1212_BE32_TO_CPU(bus_info_data[2]) >> 8) & 0x3;
+        return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3;
 }
 
 static struct csr1212_bus_ops nodemgr_csr_ops = {
@@ -580,7 +581,7 @@ static void nodemgr_create_drv_files(struct hpsb_protocol_driver *driver)
                         goto fail;
         return;
 fail:
-        HPSB_ERR("Failed to add sysfs attribute for driver %s", driver->name);
+        HPSB_ERR("Failed to add sysfs attribute");
 }
 
 
@@ -604,8 +605,7 @@ static void nodemgr_create_ne_dev_files(struct node_entry *ne)
                         goto fail;
         return;
 fail:
-        HPSB_ERR("Failed to add sysfs attribute for node %016Lx",
-                 (unsigned long long)ne->guid);
+        HPSB_ERR("Failed to add sysfs attribute");
 }
 
 
@@ -619,7 +619,7 @@ static void nodemgr_create_host_dev_files(struct hpsb_host *host)
                         goto fail;
         return;
 fail:
-        HPSB_ERR("Failed to add sysfs attribute for host %d", host->id);
+        HPSB_ERR("Failed to add sysfs attribute");
 }
 
 
@@ -679,8 +679,7 @@ static void nodemgr_create_ud_dev_files(struct unit_directory *ud)
         }
         return;
 fail:
-        HPSB_ERR("Failed to add sysfs attributes for unit %s",
-                 ud->device.bus_id);
+        HPSB_ERR("Failed to add sysfs attribute");
 }
 
 
@@ -1144,13 +1143,13 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
                 last_key_id = kv->key.id;
         }
 
-        if (ne->vendor_name_kv &&
-            device_create_file(&ne->device, &dev_attr_ne_vendor_name_kv))
-                goto fail;
-        return;
-fail:
-        HPSB_ERR("Failed to add sysfs attribute for node %016Lx",
-                 (unsigned long long)ne->guid);
+        if (ne->vendor_name_kv) {
+                int error = device_create_file(&ne->device,
+                                               &dev_attr_ne_vendor_name_kv);
+
+                if (error && error != -EEXIST)
+                        HPSB_ERR("Failed to add sysfs attribute");
+        }
 }
 
 #ifdef CONFIG_HOTPLUG
@@ -1738,7 +1737,19 @@ exit:
         return 0;
 }
 
-int nodemgr_for_each_host(void *__data, int (*cb)(struct hpsb_host *, void *))
+/**
+ * nodemgr_for_each_host - call a function for each IEEE 1394 host
+ * @data: an address to supply to the callback
+ * @cb: function to call for each host
+ *
+ * Iterate the hosts, calling a given function with supplied data for each host.
+ * If the callback fails on a host, i.e. if it returns a non-zero value, the
+ * iteration is stopped.
+ *
+ * Return value: 0 on success, non-zero on failure (same as returned by last run
+ * of the callback).
+ */
+int nodemgr_for_each_host(void *data, int (*cb)(struct hpsb_host *, void *))
 {
         struct class_device *cdev;
         struct hpsb_host *host;
@@ -1748,7 +1759,7 @@ int nodemgr_for_each_host(void *__data, int (*cb)(struct hpsb_host *, void *))
         list_for_each_entry(cdev, &hpsb_host_class.children, node) {
                 host = container_of(cdev, struct hpsb_host, class_dev);
 
-                if ((error = cb(host, __data)))
+                if ((error = cb(host, data)))
                         break;
         }
         up(&hpsb_host_class.sem);
@@ -1756,7 +1767,7 @@ int nodemgr_for_each_host(void *__data, int (*cb)(struct hpsb_host *, void *))
         return error;
 }
 
-/* The following four convenience functions use a struct node_entry
+/* The following two convenience functions use a struct node_entry
  * for addressing a node on the bus.  They are intended for use by any
  * process context, not just the nodemgr thread, so we need to be a
  * little careful when reading out the node ID and generation.  The
@@ -1771,12 +1782,20 @@ int nodemgr_for_each_host(void *__data, int (*cb)(struct hpsb_host *, void *))
  * ID's.
  */
 
-void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *pkt)
+/**
+ * hpsb_node_fill_packet - fill some destination information into a packet
+ * @ne: destination node
+ * @packet: packet to fill in
+ *
+ * This will fill in the given, pre-initialised hpsb_packet with the current
+ * information from the node entry (host, node ID, bus generation number).
+ */
+void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *packet)
 {
-        pkt->host = ne->host;
-        pkt->generation = ne->generation;
+        packet->host = ne->host;
+        packet->generation = ne->generation;
         barrier();
-        pkt->node_id = ne->nodeid;
+        packet->node_id = ne->nodeid;
 }
 
 int hpsb_node_write(struct node_entry *ne, u64 addr,