nd_btt: atomic sector updates

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

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index d0c6b4bdba699be47d3ffd1c84c0ce48ba88aeb0..7346054bccbb6228fd362c432524b5797290e443 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -160,7 +160,6 @@ static void pmem_detach_disk(struct pmem_device *pmem)
 static int pmem_attach_disk(struct nd_namespace_common *ndns,
                struct pmem_device *pmem)
 {
-       struct nd_region *nd_region = to_nd_region(ndns->dev.parent);
        struct gendisk *disk;
 
        pmem->pmem_queue = blk_alloc_queue(GFP_KERNEL);
@@ -183,7 +182,7 @@ static int pmem_attach_disk(struct nd_namespace_common *ndns,
        disk->private_data      = pmem;
        disk->queue             = pmem->pmem_queue;
        disk->flags             = GENHD_FL_EXT_DEVT;
-       sprintf(disk->disk_name, "pmem%d", nd_region->id);
+       nvdimm_namespace_disk_name(ndns, disk->disk_name);
        disk->driverfs_dev = &ndns->dev;
        set_capacity(disk, pmem->size >> 9);
        pmem->pmem_disk = disk;
@@ -211,17 +210,6 @@ static int pmem_rw_bytes(struct nd_namespace_common *ndns,
        return 0;
 }
 
-static int nvdimm_namespace_attach_btt(struct nd_namespace_common *ndns)
-{
-       /* TODO */
-       return -ENXIO;
-}
-
-static void nvdimm_namespace_detach_btt(struct nd_namespace_common *ndns)
-{
-       /* TODO */
-}
-
 static void pmem_free(struct pmem_device *pmem)
 {
        iounmap(pmem->virt_addr);