Commit fdc029b1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe
Browse files

memremap: remove the dev field in struct dev_pagemap 

The dev field in struct dev_pagemap is only used to print dev_name in two
places, which are at best nice to have.  Just remove the field and thus
the name in those two messages.

Link: https://lore.kernel.org/r/20190818090557.17853-3-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarBharata B Rao <bharata@linux.ibm.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 0c385190

include/linux/memremap.h

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ struct dev_pagemap { 
	struct percpu_ref *ref;

	struct percpu_ref internal_ref;

	struct completion done;

	struct device *dev;

	enum memory_type type;

	unsigned int flags;

	u64 pci_p2pdma_bus_offset;

kernel/memremap.c

+1 −5
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static void dev_pagemap_cleanup(struct dev_pagemap *pgmap) 
static void devm_memremap_pages_release(void *data)

{

	struct dev_pagemap *pgmap = data;

	struct device *dev = pgmap->dev;

	struct resource *res = &pgmap->res;

	unsigned long pfn;

	int nid;
@@ -123,8 +122,7 @@ static void devm_memremap_pages_release(void *data) 


	untrack_pfn(NULL, PHYS_PFN(res->start), resource_size(res));

	pgmap_array_delete(res);

	dev_WARN_ONCE(dev, pgmap->altmap.alloc,

		      "%s: failed to free all reserved pages\n", __func__);

	WARN_ONCE(pgmap->altmap.alloc, "failed to free all reserved pages\n");

}



static void dev_pagemap_percpu_release(struct percpu_ref *ref)
@@ -245,8 +243,6 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) 
		goto err_array;

	}



	pgmap->dev = dev;



	error = xa_err(xa_store_range(&pgmap_array, PHYS_PFN(res->start),

				PHYS_PFN(res->end), pgmap, GFP_KERNEL));

	if (error)

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -5982,7 +5982,7 @@ void __ref memmap_init_zone_device(struct zone *zone, 
		}

	}



	pr_info("%s initialised, %lu pages in %ums\n", dev_name(pgmap->dev),

	pr_info("%s initialised %lu pages in %ums\n", __func__,

		size, jiffies_to_msecs(jiffies - start));

}

tools/testing/nvdimm/test/iomap.c

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) 
	if (!nfit_res)

		return devm_memremap_pages(dev, pgmap);



	pgmap->dev = dev;

	if (!pgmap->ref) {

		if (pgmap->ops && (pgmap->ops->kill || pgmap->ops->cleanup))

			return ERR_PTR(-EINVAL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE