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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Bharata B Rao <bharata@linux.ibm.com>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/include/linux/memremap.h b/include/linux/memremap.h
index f8a5b2a199459c71bdfa343f48a9665f34aff080..8f0013e18e14020db72b7812e10de0daa844cc2f 100644 (file)
--- a/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@ -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;

diff --git a/kernel/memremap.c b/kernel/memremap.c
index 6ee03a816d67a889729e834b8c614675ac4cf94c..600a14cbe663c9ded1a95a83bf41dfa7b26c548f 100644 (file)
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -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)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 272c6de1bf4ead31c22aca202940da00bc8eaf8b..b39baa2b1fafcaf0674e28c6ae63c2c2a1d1485f 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -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));
 }
 

diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index cd040b5abffe37c4aa5ec99cabf88e3f8d70fbc0..3f55f2f99112fe5475a0d414e6f33e4d5d7dde87 100644 (file)
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -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);