Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[deliverable/linux.git] / drivers / nvdimm / btt.c

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 68a7c3c1eed9115bb23a7c0501c2134b4c238e39..9dce03f420eb5f77e8dc625c018c35014591abe4 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1243,7 +1243,6 @@ static int btt_blk_init(struct btt *btt)
        }
 
        nvdimm_namespace_disk_name(ndns, btt->btt_disk->disk_name);
-       btt->btt_disk->driverfs_dev = &btt->nd_btt->dev;
        btt->btt_disk->first_minor = 0;
        btt->btt_disk->fops = &btt_fops;
        btt->btt_disk->private_data = btt;
@@ -1258,7 +1257,7 @@ static int btt_blk_init(struct btt *btt)
        btt->btt_queue->queuedata = btt;
 
        set_capacity(btt->btt_disk, 0);
-       add_disk(btt->btt_disk);
+       device_add_disk(&btt->nd_btt->dev, btt->btt_disk);
        if (btt_meta_size(btt)) {
                int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));