diff options
author | Dan Williams <dan.j.williams@intel.com> | 2017-07-19 18:57:44 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2019-01-07 00:24:46 -0500 |
commit | 93694f9630b0ed29cda61df58e480dcb34ef52fd (patch) | |
tree | 7f7fff99c1017d664559d771c8bdd28503881a53 /drivers/dax | |
parent | 21b9e979501fdb5f6797193d70428a2b00bd5247 (diff) |
device-dax: Kill dax_region base
Nothing consumes this attribute of a region and devres otherwise
remembers the value for de-allocation purposes.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dax')
-rw-r--r-- | drivers/dax/dax-private.h | 2 | ||||
-rw-r--r-- | drivers/dax/device-dax.h | 5 | ||||
-rw-r--r-- | drivers/dax/device.c | 3 | ||||
-rw-r--r-- | drivers/dax/pmem.c | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h index d1b36a42132f..9b393c218fe4 100644 --- a/drivers/dax/dax-private.h +++ b/drivers/dax/dax-private.h | |||
@@ -19,7 +19,6 @@ | |||
19 | /** | 19 | /** |
20 | * struct dax_region - mapping infrastructure for dax devices | 20 | * struct dax_region - mapping infrastructure for dax devices |
21 | * @id: kernel-wide unique region for a memory range | 21 | * @id: kernel-wide unique region for a memory range |
22 | * @base: linear address corresponding to @res | ||
23 | * @kref: to pin while other agents have a need to do lookups | 22 | * @kref: to pin while other agents have a need to do lookups |
24 | * @dev: parent device backing this region | 23 | * @dev: parent device backing this region |
25 | * @align: allocation and mapping alignment for child dax devices | 24 | * @align: allocation and mapping alignment for child dax devices |
@@ -28,7 +27,6 @@ | |||
28 | */ | 27 | */ |
29 | struct dax_region { | 28 | struct dax_region { |
30 | int id; | 29 | int id; |
31 | void *base; | ||
32 | struct kref kref; | 30 | struct kref kref; |
33 | struct device *dev; | 31 | struct device *dev; |
34 | unsigned int align; | 32 | unsigned int align; |
diff --git a/drivers/dax/device-dax.h b/drivers/dax/device-dax.h index 688b051750bd..4f1c69e1b3a2 100644 --- a/drivers/dax/device-dax.h +++ b/drivers/dax/device-dax.h | |||
@@ -17,9 +17,8 @@ struct dev_dax; | |||
17 | struct resource; | 17 | struct resource; |
18 | struct dax_region; | 18 | struct dax_region; |
19 | void dax_region_put(struct dax_region *dax_region); | 19 | void dax_region_put(struct dax_region *dax_region); |
20 | struct dax_region *alloc_dax_region(struct device *parent, | 20 | struct dax_region *alloc_dax_region(struct device *parent, int region_id, |
21 | int region_id, struct resource *res, unsigned int align, | 21 | struct resource *res, unsigned int align, unsigned long flags); |
22 | void *addr, unsigned long flags); | ||
23 | struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region, | 22 | struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region, |
24 | int id, struct resource *res, int count); | 23 | int id, struct resource *res, int count); |
25 | #endif /* __DEVICE_DAX_H__ */ | 24 | #endif /* __DEVICE_DAX_H__ */ |
diff --git a/drivers/dax/device.c b/drivers/dax/device.c index a5a670c1cd58..811c1015194c 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c | |||
@@ -100,7 +100,7 @@ static void dax_region_unregister(void *region) | |||
100 | } | 100 | } |
101 | 101 | ||
102 | struct dax_region *alloc_dax_region(struct device *parent, int region_id, | 102 | struct dax_region *alloc_dax_region(struct device *parent, int region_id, |
103 | struct resource *res, unsigned int align, void *addr, | 103 | struct resource *res, unsigned int align, |
104 | unsigned long pfn_flags) | 104 | unsigned long pfn_flags) |
105 | { | 105 | { |
106 | struct dax_region *dax_region; | 106 | struct dax_region *dax_region; |
@@ -130,7 +130,6 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id, | |||
130 | dax_region->id = region_id; | 130 | dax_region->id = region_id; |
131 | dax_region->align = align; | 131 | dax_region->align = align; |
132 | dax_region->dev = parent; | 132 | dax_region->dev = parent; |
133 | dax_region->base = addr; | ||
134 | if (sysfs_create_groups(&parent->kobj, dax_region_attribute_groups)) { | 133 | if (sysfs_create_groups(&parent->kobj, dax_region_attribute_groups)) { |
135 | kfree(dax_region); | 134 | kfree(dax_region); |
136 | return NULL; | 135 | return NULL; |
diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index 2c1f459c0c63..72a76105eb02 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c | |||
@@ -125,7 +125,7 @@ static int dax_pmem_probe(struct device *dev) | |||
125 | return -EINVAL; | 125 | return -EINVAL; |
126 | 126 | ||
127 | dax_region = alloc_dax_region(dev, region_id, &res, | 127 | dax_region = alloc_dax_region(dev, region_id, &res, |
128 | le32_to_cpu(pfn_sb->align), addr, PFN_DEV|PFN_MAP); | 128 | le32_to_cpu(pfn_sb->align), PFN_DEV|PFN_MAP); |
129 | if (!dax_region) | 129 | if (!dax_region) |
130 | return -ENOMEM; | 130 | return -ENOMEM; |
131 | 131 | ||