aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2015-10-16 14:11:25 -0400
committerIlya Dryomov <idryomov@gmail.com>2015-11-02 17:36:48 -0500
commit6cac4695f2042a1d0e17aa48c5705f69907e74c3 (patch)
tree92169d02346e418d7fd330aecf0864491c292655
parentdd5ac32d425f881624bfe59c8e00dd1c3ccc6bb1 (diff)
rbd: set device_type::release instead of device::release
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>
-rw-r--r--drivers/block/rbd.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index fd7bd876b3ca..6eec200fa3b3 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3989,14 +3989,12 @@ static const struct attribute_group *rbd_attr_groups[] = {
3989 NULL 3989 NULL
3990}; 3990};
3991 3991
3992static void rbd_sysfs_dev_release(struct device *dev) 3992static void rbd_dev_release(struct device *dev);
3993{
3994}
3995 3993
3996static struct device_type rbd_device_type = { 3994static struct device_type rbd_device_type = {
3997 .name = "rbd", 3995 .name = "rbd",
3998 .groups = rbd_attr_groups, 3996 .groups = rbd_attr_groups,
3999 .release = rbd_sysfs_dev_release, 3997 .release = rbd_dev_release,
4000}; 3998};
4001 3999
4002static struct rbd_spec *rbd_spec_get(struct rbd_spec *spec) 4000static 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,
4077 rbd_dev->dev.bus = &rbd_bus_type; 4075 rbd_dev->dev.bus = &rbd_bus_type;
4078 rbd_dev->dev.type = &rbd_device_type; 4076 rbd_dev->dev.type = &rbd_device_type;
4079 rbd_dev->dev.parent = &rbd_root_dev; 4077 rbd_dev->dev.parent = &rbd_root_dev;
4080 rbd_dev->dev.release = rbd_dev_release;
4081 device_initialize(&rbd_dev->dev); 4078 device_initialize(&rbd_dev->dev);
4082 4079
4083 rbd_dev->rbd_client = rbdc; 4080 rbd_dev->rbd_client = rbdc;