diff options
| author | Liu Yuan <tailai.ly@taobao.com> | 2011-04-13 22:14:54 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-04-13 22:14:54 +0200 |
| commit | 80656b67b3988f83edd86a280d9937124fe62050 (patch) | |
| tree | 58d23b396fa17262b697134cf2a58651f26d3460 | |
| parent | f4af3c3d077a004762aaad052049c809fd8c6f0c (diff) | |
| download | linux-80656b67b3988f83edd86a280d9937124fe62050.tar.gz linux-80656b67b3988f83edd86a280d9937124fe62050.tar.bz2 linux-80656b67b3988f83edd86a280d9937124fe62050.zip | |
block, blk-sysfs: Use the variable directly instead of a function call
In the function blk_register_queue(), var _dev_ is already assigned by
disk_to_dev().So use it directly instead of calling disk_to_dev() again.
Signed-off-by: Liu Yuan <tailai.ly@taobao.com>
Modified by me to delete an empty line in the same function while
in there anyway.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
| -rw-r--r-- | block/blk-sysfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 261c75c665ae..6d735122bc59 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -498,7 +498,6 @@ int blk_register_queue(struct gendisk *disk) { int ret; struct device *dev = disk_to_dev(disk); - struct request_queue *q = disk->queue; if (WARN_ON(!q)) @@ -521,7 +520,7 @@ int blk_register_queue(struct gendisk *disk) if (ret) { kobject_uevent(&q->kobj, KOBJ_REMOVE); kobject_del(&q->kobj); - blk_trace_remove_sysfs(disk_to_dev(disk)); + blk_trace_remove_sysfs(dev); kobject_put(&dev->kobj); return ret; } |