diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-06-15 22:43:07 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-06-27 15:26:08 -0400 |
commit | 52c44d93c26f5a76068c0a8cc83bb8f56f38043d (patch) | |
tree | f069a8e70d809c950a491c505faf460bb4b4fa62 /block/genhd.c | |
parent | 0d52c756a665adc032c791307bc55e392b0186b3 (diff) |
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.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/block/genhd.c b/block/genhd.c index fb2d9aeb75a5..a18d35390f1d 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -618,10 +618,6 @@ void device_add_disk(struct device *parent, struct gendisk *disk) | |||
618 | 618 | ||
619 | blk_register_region(disk_devt(disk), disk->minors, NULL, | 619 | blk_register_region(disk_devt(disk), disk->minors, NULL, |
620 | exact_match, exact_lock, disk); | 620 | exact_match, exact_lock, disk); |
621 | |||
622 | /* temporary while we convert usages to use disk_to_dev(disk)->parent */ | ||
623 | disk->driverfs_dev = parent; | ||
624 | |||
625 | register_disk(parent, disk); | 621 | register_disk(parent, disk); |
626 | blk_register_queue(disk); | 622 | blk_register_queue(disk); |
627 | 623 | ||
@@ -804,10 +800,9 @@ void __init printk_all_partitions(void) | |||
804 | , disk_name(disk, part->partno, name_buf), | 800 | , disk_name(disk, part->partno, name_buf), |
805 | part->info ? part->info->uuid : ""); | 801 | part->info ? part->info->uuid : ""); |
806 | if (is_part0) { | 802 | if (is_part0) { |
807 | if (disk->driverfs_dev != NULL && | 803 | if (dev->parent && dev->parent->driver) |
808 | disk->driverfs_dev->driver != NULL) | ||
809 | printk(" driver: %s\n", | 804 | printk(" driver: %s\n", |
810 | disk->driverfs_dev->driver->name); | 805 | dev->parent->driver->name); |
811 | else | 806 | else |
812 | printk(" (driver?)\n"); | 807 | printk(" (driver?)\n"); |
813 | } else | 808 | } else |