block: convert to device_add_disk()

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

diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index e6f54d3b89690613e94d388f1e325adfd32b25ad..9f16ea6964ec6182e996168c0f67408b61c93f6e 100644 (file)
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -512,7 +512,6 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)
                goto out_queue;
 
        rq->queuedata = scmdev;
-       bdev->gendisk->driverfs_dev = &scmdev->dev;
        bdev->gendisk->private_data = scmdev;
        bdev->gendisk->fops = &scm_blk_devops;
        bdev->gendisk->queue = rq;
@@ -531,7 +530,7 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)
 
        /* 512 byte sectors */
        set_capacity(bdev->gendisk, scmdev->size >> 9);
-       add_disk(bdev->gendisk);
+       device_add_disk(&scmdev->dev, bdev->gendisk);
        return 0;
 
 out_queue: