block: convert to device_add_disk()

[deliverable/linux.git] / drivers / block / rsxx / dev.c

diff --git a/drivers/block/rsxx/dev.c b/drivers/block/rsxx/dev.c
index e1b8b7061d2f8b224f851131e9324726bf89277c..f81d70b39d1096da4ea5338cdcb5c8aa22defcb4 100644 (file)
--- a/drivers/block/rsxx/dev.c
+++ b/drivers/block/rsxx/dev.c
@@ -230,8 +230,7 @@ int rsxx_attach_dev(struct rsxx_cardinfo *card)
                        set_capacity(card->gendisk, card->size8 >> 9);
                else
                        set_capacity(card->gendisk, 0);
-               add_disk(card->gendisk);
-
+               device_add_disk(CARD_TO_DEV(card), card->gendisk);
                card->bdev_attached = 1;
        }
 
@@ -308,7 +307,6 @@ int rsxx_setup_dev(struct rsxx_cardinfo *card)
 
        snprintf(card->gendisk->disk_name, sizeof(card->gendisk->disk_name),
                 "rsxx%d", card->disk_id);
-       card->gendisk->driverfs_dev = &card->dev->dev;
        card->gendisk->major = card->major;
        card->gendisk->first_minor = 0;
        card->gendisk->fops = &rsxx_fops;