block: remove block_device_operations ->direct_access()

Now that all the producers and consumers of dax interfaces have been
converted to using dax_operations on a dax_device, remove the block
device direct_access enabling.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

4 files changed, 0 insertions, 54 deletions

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 60f3193c9ce2..bfa4ed2c75ef 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -395,18 +395,6 @@ static long __brd_direct_access(struct brd_device *brd, pgoff_t pgoff,
         return 1;
 }
 
-static long brd_blk_direct_access(struct block_device *bdev, sector_t sector,
-                        void **kaddr, pfn_t *pfn, long size)
-{
-        struct brd_device *brd = bdev->bd_disk->private_data;
-        long nr_pages = __brd_direct_access(brd, PHYS_PFN(sector * 512),
-                        PHYS_PFN(size), kaddr, pfn);
-
-        if (nr_pages < 0)
-                return nr_pages;
-        return nr_pages * PAGE_SIZE;
-}
-
 static long brd_dax_direct_access(struct dax_device *dax_dev,
                 pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn)
 {
@@ -418,14 +406,11 @@ static long brd_dax_direct_access(struct dax_device *dax_dev,
 static const struct dax_operations brd_dax_ops = {
         .direct_access = brd_dax_direct_access,
 };
-#else
-#define brd_blk_direct_access NULL
 #endif
 
 static const struct block_device_operations brd_fops = {
         .owner =                THIS_MODULE,
         .rw_page =              brd_rw_page,
-        .direct_access =        brd_blk_direct_access,
 };
 
 /*
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index ef4c6f8cad47..79d5f5fd823e 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -957,18 +957,6 @@ static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
         return ret;
 }
 
-static long dm_blk_direct_access(struct block_device *bdev, sector_t sector,
-                void **kaddr, pfn_t *pfn, long size)
-{
-        struct mapped_device *md = bdev->bd_disk->private_data;
-        struct dax_device *dax_dev = md->dax_dev;
-        long nr_pages = size / PAGE_SIZE;
-
-        nr_pages = dm_dax_direct_access(dax_dev, sector / PAGE_SECTORS,
-                        nr_pages, kaddr, pfn);
-        return nr_pages < 0 ? nr_pages : nr_pages * PAGE_SIZE;
-}
-
 /*
  * A target may call dm_accept_partial_bio only from the map routine.  It is
  * allowed for all bio types except REQ_PREFLUSH.
@@ -2823,7 +2811,6 @@ static const struct block_device_operations dm_blk_dops = {
         .open = dm_blk_open,
         .release = dm_blk_close,
         .ioctl = dm_blk_ioctl,
-        .direct_access = dm_blk_direct_access,
         .getgeo = dm_blk_getgeo,
         .pr_ops = &dm_pr_ops,
         .owner = THIS_MODULE
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index fbbcf8154eec..85b85633d674 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -220,19 +220,9 @@ __weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,
         return PHYS_PFN(pmem->size - pmem->pfn_pad - offset);
 }
 
-static long pmem_blk_direct_access(struct block_device *bdev, sector_t sector,
-                void **kaddr, pfn_t *pfn, long size)
-{
-        struct pmem_device *pmem = bdev->bd_queue->queuedata;
-
-        return __pmem_direct_access(pmem, PHYS_PFN(sector * 512),
-                        PHYS_PFN(size), kaddr, pfn);
-}
-
 static const struct block_device_operations pmem_fops = {
         .owner =                THIS_MODULE,
         .rw_page =              pmem_rw_page,
-        .direct_access =        pmem_blk_direct_access,
         .revalidate_disk =      nvdimm_revalidate_disk,
 };
 
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index dc84cfd4e438..36e5280af3e4 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -31,8 +31,6 @@ static int dcssblk_open(struct block_device *bdev, fmode_t mode);
 static void dcssblk_release(struct gendisk *disk, fmode_t mode);
 static blk_qc_t dcssblk_make_request(struct request_queue *q,
                                                 struct bio *bio);
-static long dcssblk_blk_direct_access(struct block_device *bdev, sector_t secnum,
-                         void **kaddr, pfn_t *pfn, long size);
 static long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
                 long nr_pages, void **kaddr, pfn_t *pfn);
 
@@ -43,7 +41,6 @@ static const struct block_device_operations dcssblk_devops = {
         .owner          = THIS_MODULE,
         .open           = dcssblk_open,
         .release        = dcssblk_release,
-        .direct_access  = dcssblk_blk_direct_access,
 };
 
 static const struct dax_operations dcssblk_dax_ops = {
@@ -916,19 +913,6 @@ __dcssblk_direct_access(struct dcssblk_dev_info *dev_info, pgoff_t pgoff,
 }
 
 static long
-dcssblk_blk_direct_access(struct block_device *bdev, sector_t secnum,
-                        void **kaddr, pfn_t *pfn, long size)
-{
-        struct dcssblk_dev_info *dev_info;
-
-        dev_info = bdev->bd_disk->private_data;
-        if (!dev_info)
-                return -ENODEV;
-        return __dcssblk_direct_access(dev_info, PHYS_PFN(secnum * 512),
-                        PHYS_PFN(size), kaddr, pfn) * PAGE_SIZE;
-}
-
-static long
 dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
                 long nr_pages, void **kaddr, pfn_t *pfn)
 {