rbd: set device_type::release instead of device::release
authorIlya Dryomov <idryomov@gmail.com>
Fri, 16 Oct 2015 18:11:25 +0000 (20:11 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 2 Nov 2015 22:36:48 +0000 (23:36 +0100)
No point in providing an empty device_type::release callback and then
setting device::release for each rbd_dev dynamically.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
drivers/block/rbd.c

index fd7bd876b3ca03f284acc28c2c7c124f59fdd5ef..6eec200fa3b35977a00b31be6b992cb34b741c45 100644 (file)
@@ -3989,14 +3989,12 @@ static const struct attribute_group *rbd_attr_groups[] = {
        NULL
 };
 
-static void rbd_sysfs_dev_release(struct device *dev)
-{
-}
+static void rbd_dev_release(struct device *dev);
 
 static struct device_type rbd_device_type = {
        .name           = "rbd",
        .groups         = rbd_attr_groups,
-       .release        = rbd_sysfs_dev_release,
+       .release        = rbd_dev_release,
 };
 
 static struct rbd_spec *rbd_spec_get(struct rbd_spec *spec)
@@ -4077,7 +4075,6 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc,
        rbd_dev->dev.bus = &rbd_bus_type;
        rbd_dev->dev.type = &rbd_device_type;
        rbd_dev->dev.parent = &rbd_root_dev;
-       rbd_dev->dev.release = rbd_dev_release;
        device_initialize(&rbd_dev->dev);
 
        rbd_dev->rbd_client = rbdc;