diff options
| author | Alex Elder <elder@inktank.com> | 2012-11-16 09:29:16 -0600 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-12-20 10:56:44 -0600 |
| commit | c3e946ce7276faf0b302acd25c7b874edbeba661 (patch) | |
| tree | 8352894ced729e1eb0397574c5508f0e9a61a192 /drivers/block | |
| parent | c89ce05e0c5a01a256100ac6a6019f276bdd1ca6 (diff) | |
| download | linux-c3e946ce7276faf0b302acd25c7b874edbeba661.tar.gz linux-c3e946ce7276faf0b302acd25c7b874edbeba661.tar.bz2 linux-c3e946ce7276faf0b302acd25c7b874edbeba661.zip | |
rbd: get rid of rbd_{get,put}_dev()
The functions rbd_get_dev() and rbd_put_dev() are trivial wrappers
that add no value, and their existence suggests they may do more
than what they do.
Get rid of them.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/rbd.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 4daa400c13aa..89576a0b3f2e 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -290,16 +290,6 @@ static struct device rbd_root_dev = { # define rbd_assert(expr) ((void) 0) #endif /* !RBD_DEBUG */ -static struct device *rbd_get_dev(struct rbd_device *rbd_dev) -{ - return get_device(&rbd_dev->dev); -} - -static void rbd_put_dev(struct rbd_device *rbd_dev) -{ - put_device(&rbd_dev->dev); -} - static int rbd_dev_refresh(struct rbd_device *rbd_dev, u64 *hver); static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev, u64 *hver); @@ -311,7 +301,7 @@ static int rbd_open(struct block_device *bdev, fmode_t mode) return -EROFS; mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING); - rbd_get_dev(rbd_dev); + (void) get_device(&rbd_dev->dev); set_device_ro(bdev, rbd_dev->mapping.read_only); rbd_dev->open_count++; mutex_unlock(&ctl_mutex); @@ -326,7 +316,7 @@ static int rbd_release(struct gendisk *disk, fmode_t mode) mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING); rbd_assert(rbd_dev->open_count > 0); rbd_dev->open_count--; - rbd_put_dev(rbd_dev); + put_device(&rbd_dev->dev); mutex_unlock(&ctl_mutex); return 0; |