block: convert to device_add_disk()

[mirror_ubuntu-bionic-kernel.git] / drivers / memstick / core / mspro_block.c

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 0fb27d3388110909e172a25750fce141d5cdd176..25b66c54045798a6cd17b3dbe0bfce489b548305 100644 (file)
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -1243,7 +1243,6 @@ static int mspro_block_init_disk(struct memstick_dev *card)
        msb->usage_count = 1;
        msb->disk->private_data = msb;
        msb->disk->queue = msb->queue;
-       msb->disk->driverfs_dev = &card->dev;
 
        sprintf(msb->disk->disk_name, "mspblk%d", disk_id);
 
@@ -1255,7 +1254,7 @@ static int mspro_block_init_disk(struct memstick_dev *card)
        set_capacity(msb->disk, capacity);
        dev_dbg(&card->dev, "capacity set %ld\n", capacity);
 
-       add_disk(msb->disk);
+       device_add_disk(&card->dev, msb->disk);
        msb->active = 1;
        return 0;