Merge branch 'for-4.8/drivers' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / nvdimm / pmem.c

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 53b701b2f73ee7d6a75e5407a18bdce8c3cbae13..36cb39047d5b77b17eb3d04980b82b36980e7ce4 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -298,14 +298,13 @@ static int pmem_attach_disk(struct device *dev,
        disk->queue             = q;
        disk->flags             = GENHD_FL_EXT_DEVT;
        nvdimm_namespace_disk_name(ndns, disk->disk_name);
-       disk->driverfs_dev = dev;
        set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)
                        / 512);
        if (devm_init_badblocks(dev, &pmem->bb))
                return -ENOMEM;
        nvdimm_badblocks_populate(to_nd_region(dev->parent), &pmem->bb, res);
        disk->bb = &pmem->bb;
-       add_disk(disk);
+       device_add_disk(dev, disk);
        revalidate_disk(disk);
 
        return 0;