|
@@ -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
|