aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/lightnvm/core.c4
-rw-r--r--include/linux/lightnvm.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 63d948cc6dec..77901bf17416 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -581,7 +581,7 @@ static void nvm_ppa_tgt_to_dev(struct nvm_tgt_dev *tgt_dev,
581 581
582 for (i = 0; i < nr_ppas; i++) { 582 for (i = 0; i < nr_ppas; i++) {
583 nvm_map_to_dev(tgt_dev, &ppa_list[i]); 583 nvm_map_to_dev(tgt_dev, &ppa_list[i]);
584 ppa_list[i] = generic_to_dev_addr(tgt_dev, ppa_list[i]); 584 ppa_list[i] = generic_to_dev_addr(tgt_dev->parent, ppa_list[i]);
585 } 585 }
586} 586}
587 587
@@ -591,7 +591,7 @@ static void nvm_ppa_dev_to_tgt(struct nvm_tgt_dev *tgt_dev,
591 int i; 591 int i;
592 592
593 for (i = 0; i < nr_ppas; i++) { 593 for (i = 0; i < nr_ppas; i++) {
594 ppa_list[i] = dev_to_generic_addr(tgt_dev, ppa_list[i]); 594 ppa_list[i] = dev_to_generic_addr(tgt_dev->parent, ppa_list[i]);
595 nvm_map_to_tgt(tgt_dev, &ppa_list[i]); 595 nvm_map_to_tgt(tgt_dev, &ppa_list[i]);
596 } 596 }
597} 597}
diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index f2549b4b8626..f3b273e543c3 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -397,10 +397,10 @@ struct nvm_dev {
397 struct list_head targets; 397 struct list_head targets;
398}; 398};
399 399
400static inline struct ppa_addr generic_to_dev_addr(struct nvm_tgt_dev *tgt_dev, 400static inline struct ppa_addr generic_to_dev_addr(struct nvm_dev *dev,
401 struct ppa_addr r) 401 struct ppa_addr r)
402{ 402{
403 struct nvm_geo *geo = &tgt_dev->geo; 403 struct nvm_geo *geo = &dev->geo;
404 struct ppa_addr l; 404 struct ppa_addr l;
405 405
406 if (geo->version == NVM_OCSSD_SPEC_12) { 406 if (geo->version == NVM_OCSSD_SPEC_12) {
@@ -424,10 +424,10 @@ static inline struct ppa_addr generic_to_dev_addr(struct nvm_tgt_dev *tgt_dev,
424 return l; 424 return l;
425} 425}
426 426
427static inline struct ppa_addr dev_to_generic_addr(struct nvm_tgt_dev *tgt_dev, 427static inline struct ppa_addr dev_to_generic_addr(struct nvm_dev *dev,
428 struct ppa_addr r) 428 struct ppa_addr r)
429{ 429{
430 struct nvm_geo *geo = &tgt_dev->geo; 430 struct nvm_geo *geo = &dev->geo;
431 struct ppa_addr l; 431 struct ppa_addr l;
432 432
433 l.ppa = 0; 433 l.ppa = 0;