Commit 93694f96 authored by Dan Williams's avatar Dan Williams
Browse files

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: default avatarDan Williams <dan.j.williams@intel.com>
parent 21b9e979

drivers/dax/dax-private.h

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
/**

 * struct dax_region - mapping infrastructure for dax devices

 * @id: kernel-wide unique region for a memory range

 * @base: linear address corresponding to @res

 * @kref: to pin while other agents have a need to do lookups

 * @dev: parent device backing this region

 * @align: allocation and mapping alignment for child dax devices
@@ -28,7 +27,6 @@ 
 */

struct dax_region {

	int id;

	void *base;

	struct kref kref;

	struct device *dev;

	unsigned int align;

drivers/dax/device-dax.h

+2 −3
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ struct dev_dax; 
struct resource;

struct dax_region;

void dax_region_put(struct dax_region *dax_region);

struct dax_region *alloc_dax_region(struct device *parent,

		int region_id, struct resource *res, unsigned int align,

		void *addr, unsigned long flags);

struct dax_region *alloc_dax_region(struct device *parent, int region_id,

		struct resource *res, unsigned int align, unsigned long flags);

struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,

		int id, struct resource *res, int count);

#endif /* __DEVICE_DAX_H__ */

drivers/dax/device.c

+1 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void dax_region_unregister(void *region) 
}



struct dax_region *alloc_dax_region(struct device *parent, int region_id,

		struct resource *res, unsigned int align, void *addr,

		struct resource *res, unsigned int align,

		unsigned long pfn_flags)

{

	struct dax_region *dax_region;
@@ -130,7 +130,6 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id, 
	dax_region->id = region_id;

	dax_region->align = align;

	dax_region->dev = parent;

	dax_region->base = addr;

	if (sysfs_create_groups(&parent->kobj, dax_region_attribute_groups)) {

		kfree(dax_region);

		return NULL;

drivers/dax/pmem.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int dax_pmem_probe(struct device *dev) 
		return -EINVAL;



	dax_region = alloc_dax_region(dev, region_id, &res,

			le32_to_cpu(pfn_sb->align), addr, PFN_DEV|PFN_MAP);

			le32_to_cpu(pfn_sb->align), PFN_DEV|PFN_MAP);

	if (!dax_region)

		return -ENOMEM;