summaryrefslogtreecommitdiffstats
path: root/block/genhd.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-06-15 19:43:07 -0700
committerDan Williams <dan.j.williams@intel.com>2016-06-27 12:26:08 -0700
commit52c44d93c26f5a76068c0a8cc83bb8f56f38043d (patch)
treef069a8e70d809c950a491c505faf460bb4b4fa62 /block/genhd.c
parent0d52c756a665adc032c791307bc55e392b0186b3 (diff)
downloadlinux-0-day-52c44d93c26f5a76068c0a8cc83bb8f56f38043d.tar.gz
block: remove ->driverfs_dev
Now that all drivers that specify a ->driverfs_dev have been converted to device_add_disk(), the pointer can be removed from struct gendisk. Cc: Jens Axboe <axboe@fb.com> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'block/genhd.c')
-rw-r--r--block/genhd.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/block/genhd.c b/block/genhd.c
index fb2d9ae..a18d353 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -618,10 +618,6 @@ void device_add_disk(struct device *parent, struct gendisk *disk)
blk_register_region(disk_devt(disk), disk->minors, NULL,
exact_match, exact_lock, disk);
-
- /* temporary while we convert usages to use disk_to_dev(disk)->parent */
- disk->driverfs_dev = parent;
-
register_disk(parent, disk);
blk_register_queue(disk);
@@ -804,10 +800,9 @@ void __init printk_all_partitions(void)
, disk_name(disk, part->partno, name_buf),
part->info ? part->info->uuid : "");
if (is_part0) {
- if (disk->driverfs_dev != NULL &&
- disk->driverfs_dev->driver != NULL)
+ if (dev->parent && dev->parent->driver)
printk(" driver: %s\n",
- disk->driverfs_dev->driver->name);
+ dev->parent->driver->name);
else
printk(" (driver?)\n");
} else