1 files changed, 30 insertions, 22 deletions

diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index d90a3a1898c0..ee82a5320bf7 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -31,9 +31,10 @@
 #include "config_roms.h"
 
 
-static void delayed_reset_bus(void * __reset_info)
+static void delayed_reset_bus(struct work_struct *work)
 {
-        struct hpsb_host *host = (struct hpsb_host*)__reset_info;
+        struct hpsb_host *host =
+                container_of(work, struct hpsb_host, delayed_reset.work);
         int generation = host->csr.generation + 1;
 
         /* The generation field rolls over to 2 rather than 0 per IEEE
@@ -43,9 +44,10 @@ static void delayed_reset_bus(void * __reset_info)
 
         CSR_SET_BUS_INFO_GENERATION(host->csr.rom, generation);
         if (csr1212_generate_csr_image(host->csr.rom) != CSR1212_SUCCESS) {
-                /* CSR image creation failed, reset generation field and do not
-                 * issue a bus reset. */
-                CSR_SET_BUS_INFO_GENERATION(host->csr.rom, host->csr.generation);
+                /* CSR image creation failed.
+                 * Reset generation field and do not issue a bus reset. */
+                CSR_SET_BUS_INFO_GENERATION(host->csr.rom,
+                                            host->csr.generation);
                 return;
         }
 
@@ -53,7 +55,8 @@ static void delayed_reset_bus(void * __reset_info)
 
         host->update_config_rom = 0;
         if (host->driver->set_hw_config_rom)
-                host->driver->set_hw_config_rom(host, host->csr.rom->bus_info_data);
+                host->driver->set_hw_config_rom(host,
+                                                host->csr.rom->bus_info_data);
 
         host->csr.gen_timestamp[host->csr.generation] = jiffies;
         hpsb_reset_bus(host, SHORT_RESET);
@@ -69,7 +72,8 @@ static int dummy_devctl(struct hpsb_host *h, enum devctl_cmd c, int arg)
         return -1;
 }
 
-static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg)
+static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command,
+                        unsigned long arg)
 {
         return -1;
 }
@@ -122,15 +126,13 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
         int i;
         int hostnum = 0;
 
-        h = kzalloc(sizeof(*h) + extra, SLAB_KERNEL);
+        h = kzalloc(sizeof(*h) + extra, GFP_KERNEL);
         if (!h)
                 return NULL;
 
         h->csr.rom = csr1212_create_csr(&csr_bus_ops, CSR_BUS_INFO_SIZE, h);
-        if (!h->csr.rom) {
-                kfree(h);
-                return NULL;
-        }
+        if (!h->csr.rom)
+                goto fail;
 
         h->hostdata = h + 1;
         h->driver = drv;
@@ -145,21 +147,20 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
 
         atomic_set(&h->generation, 0);
 
-        INIT_WORK(&h->delayed_reset, delayed_reset_bus, h);
+        INIT_DELAYED_WORK(&h->delayed_reset, delayed_reset_bus);
         
         init_timer(&h->timeout);
         h->timeout.data = (unsigned long) h;
         h->timeout.function = abort_timedouts;
-        h->timeout_interval = HZ / 20; // 50ms by default
+        h->timeout_interval = HZ / 20; /* 50ms, half of minimum SPLIT_TIMEOUT */
 
         h->topology_map = h->csr.topology_map + 3;
         h->speed_map = (u8 *)(h->csr.speed_map + 2);
 
         mutex_lock(&host_num_alloc);
-
         while (nodemgr_for_each_host(&hostnum, alloc_hostnum_cb))
                 hostnum++;
-
+        mutex_unlock(&host_num_alloc);
         h->id = hostnum;
 
         memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device));
@@ -170,13 +171,19 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
         h->class_dev.class = &hpsb_host_class;
         snprintf(h->class_dev.class_id, BUS_ID_SIZE, "fw-host%d", h->id);
 
-        device_register(&h->device);
-        class_device_register(&h->class_dev);
+        if (device_register(&h->device))
+                goto fail;
+        if (class_device_register(&h->class_dev)) {
+                device_unregister(&h->device);
+                goto fail;
+        }
         get_device(&h->device);
 
-        mutex_unlock(&host_num_alloc);
-
         return h;
+
+fail:
+        kfree(h);
+        return NULL;
 }
 
 int hpsb_add_host(struct hpsb_host *host)
@@ -228,13 +235,14 @@ int hpsb_update_config_rom_image(struct hpsb_host *host)
         if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ))
                 /* Wait 60 seconds from the last time this generation number was
                  * used. */
-                reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;
+                reset_delay =
+                        (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;
         else
                 /* Wait 1 second in case some other code wants to change the
                  * Config ROM in the near future. */
                 reset_delay = HZ;
 
-        PREPARE_WORK(&host->delayed_reset, delayed_reset_bus, host);
+        PREPARE_DELAYED_WORK(&host->delayed_reset, delayed_reset_bus);
         schedule_delayed_work(&host->delayed_reset, reset_delay);
 
         return 0;