greybus: hd: initialise device last
authorJohan Hovold <johan@hovoldconsulting.com>
Mon, 7 Dec 2015 14:05:35 +0000 (15:05 +0100)
committerGreg Kroah-Hartman <gregkh@google.com>
Tue, 8 Dec 2015 20:31:14 +0000 (15:31 -0500)
Initialise the struct device last when creating the host device.

After device_initialize(), or rather dev_set_name(), we must use
put_device to release the host device. Initialising last will allow for
a simpler release callback.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/hd.c

index 74569a3..e38c41c 100644 (file)
@@ -72,20 +72,12 @@ struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
        if (!hd)
                return ERR_PTR(-ENOMEM);
 
-       hd->dev.parent = parent;
-       hd->dev.bus = &greybus_bus_type;
-       hd->dev.type = &greybus_hd_type;
-       hd->dev.dma_mask = hd->dev.parent->dma_mask;
-       device_initialize(&hd->dev);
-
        ret = ida_simple_get(&gb_hd_bus_id_map, 1, 0, GFP_KERNEL);
        if (ret < 0) {
                kfree(hd);
                return ERR_PTR(ret);
        }
-
        hd->bus_id = ret;
-       dev_set_name(&hd->dev, "greybus%d", hd->bus_id);
 
        hd->driver = driver;
        INIT_LIST_HEAD(&hd->interfaces);
@@ -94,6 +86,13 @@ struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
        hd->buffer_size_max = buffer_size_max;
        hd->num_cports = num_cports;
 
+       hd->dev.parent = parent;
+       hd->dev.bus = &greybus_bus_type;
+       hd->dev.type = &greybus_hd_type;
+       hd->dev.dma_mask = hd->dev.parent->dma_mask;
+       device_initialize(&hd->dev);
+       dev_set_name(&hd->dev, "greybus%d", hd->bus_id);
+
        return hd;
 }
 EXPORT_SYMBOL_GPL(gb_hd_create);