diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-06-07 19:38:04 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-11 18:09:26 -0400 |
commit | a8a6d2e04c4ffda055db70814c50bd106e44730f (patch) | |
tree | 708293a26c301df1473b78ab09b1d89849be37a7 /drivers/nvdimm | |
parent | 29b9aa0aa3837c93ecd804dd3ada39b8cc75607d (diff) |
libnvdimm, nfit: remove nfit_spa_map() infrastructure
Now that all shared mappings are handled by devm_nvdimm_memremap() we no
longer need nfit_spa_map() nor do we need to trigger a callback to the
bus provider at region disable time.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r-- | drivers/nvdimm/nd.h | 1 | ||||
-rw-r--r-- | drivers/nvdimm/region_devs.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index d0ac93c31dda..2819e886dfd2 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h | |||
@@ -119,7 +119,6 @@ struct nd_region { | |||
119 | 119 | ||
120 | struct nd_blk_region { | 120 | struct nd_blk_region { |
121 | int (*enable)(struct nvdimm_bus *nvdimm_bus, struct device *dev); | 121 | int (*enable)(struct nvdimm_bus *nvdimm_bus, struct device *dev); |
122 | void (*disable)(struct nvdimm_bus *nvdimm_bus, struct device *dev); | ||
123 | int (*do_io)(struct nd_blk_region *ndbr, resource_size_t dpa, | 122 | int (*do_io)(struct nd_blk_region *ndbr, resource_size_t dpa, |
124 | void *iobuf, u64 len, int rw); | 123 | void *iobuf, u64 len, int rw); |
125 | void *blk_provider_data; | 124 | void *blk_provider_data; |
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index 40fcfea26fbb..694b21024871 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c | |||
@@ -433,8 +433,6 @@ static void nd_region_notify_driver_action(struct nvdimm_bus *nvdimm_bus, | |||
433 | 433 | ||
434 | if (is_nd_pmem(dev)) | 434 | if (is_nd_pmem(dev)) |
435 | return; | 435 | return; |
436 | |||
437 | to_nd_blk_region(dev)->disable(nvdimm_bus, dev); | ||
438 | } | 436 | } |
439 | if (dev->parent && is_nd_blk(dev->parent) && probe) { | 437 | if (dev->parent && is_nd_blk(dev->parent) && probe) { |
440 | nd_region = to_nd_region(dev->parent); | 438 | nd_region = to_nd_region(dev->parent); |
@@ -698,7 +696,6 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, | |||
698 | if (ndbr) { | 696 | if (ndbr) { |
699 | nd_region = &ndbr->nd_region; | 697 | nd_region = &ndbr->nd_region; |
700 | ndbr->enable = ndbr_desc->enable; | 698 | ndbr->enable = ndbr_desc->enable; |
701 | ndbr->disable = ndbr_desc->disable; | ||
702 | ndbr->do_io = ndbr_desc->do_io; | 699 | ndbr->do_io = ndbr_desc->do_io; |
703 | } | 700 | } |
704 | region_buf = ndbr; | 701 | region_buf = ndbr; |