lightnvm: collapse nvm_erase_ppa and nvm_erase_blk

After gennvm and core have been merged, there are no more callers to
nvm_erase_ppa. Therefore collapse the device specific and target
specific erase functions.

Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index e9a495650dd088cb2f1f97eb987f1b1f447aa264..a4e2e3b01ae4984840e65a497516eb7e4d725cf1 100644 (file)
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -683,12 +683,34 @@ int nvm_submit_io(struct nvm_tgt_dev *tgt_dev, struct nvm_rq *rqd)
 }
 EXPORT_SYMBOL(nvm_submit_io);
 
-int nvm_erase_blk(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p, int flags)
+int nvm_erase_blk(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas, int flags)
 {
-       /* Convert address space */
-       nvm_map_to_dev(tgt_dev, p);
+       struct nvm_dev *dev = tgt_dev->parent;
+       struct nvm_rq rqd;
+       int ret;
+
+       if (!dev->ops->erase_block)
+               return 0;
+
+       ret = nvm_map_to_dev(tgt_dev, ppas);
+       if (ret)
+               return ret;
+
+       memset(&rqd, 0, sizeof(struct nvm_rq));
 
-       return nvm_erase_ppa(tgt_dev->parent, p, 1, flags);
+       ret = nvm_set_rqd_ppalist(dev, &rqd, ppas, 1, 1);
+       if (ret)
+               return ret;
+
+       nvm_generic_to_addr_mode(dev, &rqd);
+
+       rqd.flags = flags;
+
+       ret = dev->ops->erase_block(dev, &rqd);
+
+       nvm_free_rqd_ppalist(dev, &rqd);
+
+       return ret;
 }
 EXPORT_SYMBOL(nvm_erase_blk);
 
@@ -847,33 +869,6 @@ void nvm_free_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd)
 }
 EXPORT_SYMBOL(nvm_free_rqd_ppalist);
 
-int nvm_erase_ppa(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas,
-                                                               int flags)
-{
-       struct nvm_rq rqd;
-       int ret;
-
-       if (!dev->ops->erase_block)
-               return 0;
-
-       memset(&rqd, 0, sizeof(struct nvm_rq));
-
-       ret = nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas, 1);
-       if (ret)
-               return ret;
-
-       nvm_generic_to_addr_mode(dev, &rqd);
-
-       rqd.flags = flags;
-
-       ret = dev->ops->erase_block(dev, &rqd);
-
-       nvm_free_rqd_ppalist(dev, &rqd);
-
-       return ret;
-}
-EXPORT_SYMBOL(nvm_erase_ppa);
-
 void nvm_end_io(struct nvm_rq *rqd, int error)
 {
        struct nvm_tgt_dev *tgt_dev = rqd->dev;

diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index 84309fe27472b1c766e863cb920c930106a747e6..f2007b2c49796e063282b25a2efffd7cad976bdf 100644 (file)
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -483,7 +483,6 @@ extern void nvm_addr_to_generic_mode(struct nvm_dev *, struct nvm_rq *);
 extern int nvm_set_rqd_ppalist(struct nvm_dev *, struct nvm_rq *,
                                        const struct ppa_addr *, int, int);
 extern void nvm_free_rqd_ppalist(struct nvm_dev *, struct nvm_rq *);
-extern int nvm_erase_ppa(struct nvm_dev *, struct ppa_addr *, int, int);
 extern int nvm_erase_blk(struct nvm_tgt_dev *, struct ppa_addr *, int);
 extern int nvm_get_l2p_tbl(struct nvm_tgt_dev *, u64, u32, nvm_l2p_update_fn *,
                           void *);