block: convert to device_add_disk()

[mirror_ubuntu-bionic-kernel.git] / drivers / block / cciss.c

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 63c2064689f864aa515bf8a5b78c5841e7e91bab..db9d6bb6352d97a0a2cc9099a16317227edca96f 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1951,7 +1951,6 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
        if (cciss_create_ld_sysfs_entry(h, drv_index))
                goto cleanup_queue;
        disk->private_data = h->drv[drv_index];
-       disk->driverfs_dev = &h->drv[drv_index]->dev;
 
        /* Set up queue information */
        blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);
@@ -1973,7 +1972,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
        /* allows the interrupt handler to start the queue */
        wmb();
        h->drv[drv_index]->queue = disk->queue;
-       add_disk(disk);
+       device_add_disk(&h->drv[drv_index]->dev, disk);
        return 0;
 
 cleanup_queue: