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.
Unified · Split
| @@ -109,7 +109,6 @@ struct dev_pagemap { · 108 unmodified lines | |||
| 109 | struct percpu_ref *ref; | 109 | struct percpu_ref *ref; |
| 110 | struct percpu_ref internal_ref; | 110 | struct percpu_ref internal_ref; |
| 111 | struct completion done; | 111 | struct completion done; |
| 112 | struct device *dev; | ||
| 113 | enum memory_type type; | 112 | enum memory_type type; |
| 114 | unsigned int flags; | 113 | unsigned int flags; |
| 115 | u64 pci_p2pdma_bus_offset; | 114 | u64 pci_p2pdma_bus_offset; |
| @@ -96,7 +96,6 @@ static void dev_pagemap_cleanup(struct dev_pagemap *pgmap) · 95 unmodified lines | |||
| 96 | static void devm_memremap_pages_release(void *data) | 96 | static void devm_memremap_pages_release(void *data) |
| 97 | { | 97 | { |
| 98 | struct dev_pagemap *pgmap = data; | 98 | struct dev_pagemap *pgmap = data; |
| 99 | struct device *dev = pgmap->dev; | ||
| 100 | struct resource *res = &pgmap->res; | 99 | struct resource *res = &pgmap->res; |
| 101 | unsigned long pfn; | 100 | unsigned long pfn; |
| 102 | int nid; | 101 | int nid; |
| @@ -123,8 +122,7 @@ static void devm_memremap_pages_release(void *data) · 20 unmodified lines | |||
| 123 | 122 | ||
| 124 | untrack_pfn(NULL, PHYS_PFN(res->start), resource_size(res)); | 123 | untrack_pfn(NULL, PHYS_PFN(res->start), resource_size(res)); |
| 125 | pgmap_array_delete(res); | 124 | pgmap_array_delete(res); |
| 126 | dev_WARN_ONCE(dev, pgmap->altmap.alloc, | 125 | WARN_ONCE(pgmap->altmap.alloc, "failed to free all reserved pages\n"); |
| 127 | "%s: failed to free all reserved pages\n", __func__); | ||
| 128 | } | 126 | } |
| 129 | 127 | ||
| 130 | static void dev_pagemap_percpu_release(struct percpu_ref *ref) | 128 | 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) · 114 unmodified lines | |||
| 245 | goto err_array; | 243 | goto err_array; |
| 246 | } | 244 | } |
| 247 | 245 | ||
| 248 | pgmap->dev = dev; | ||
| 249 | |||
| 250 | error = xa_err(xa_store_range(&pgmap_array, PHYS_PFN(res->start), | 246 | error = xa_err(xa_store_range(&pgmap_array, PHYS_PFN(res->start), |
| 251 | PHYS_PFN(res->end), pgmap, GFP_KERNEL)); | 247 | PHYS_PFN(res->end), pgmap, GFP_KERNEL)); |
| 252 | if (error) | 248 | if (error) |
| @@ -5982,7 +5982,7 @@ void __ref memmap_init_zone_device(struct zone *zone, · 5981 unmodified lines | |||
| 5982 | } | 5982 | } |
| 5983 | } | 5983 | } |
| 5984 | 5984 | ||
| 5985 | pr_info("%s initialised, %lu pages in %ums\n", dev_name(pgmap->dev), | 5985 | pr_info("%s initialised %lu pages in %ums\n", __func__, |
| 5986 | size, jiffies_to_msecs(jiffies - start)); | 5986 | size, jiffies_to_msecs(jiffies - start)); |
| 5987 | } | 5987 | } |
| 5988 | 5988 | ||
| @@ -132,7 +132,6 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) · 131 unmodified lines | |||
| 132 | if (!nfit_res) | 132 | if (!nfit_res) |
| 133 | return devm_memremap_pages(dev, pgmap); | 133 | return devm_memremap_pages(dev, pgmap); |
| 134 | 134 | ||
| 135 | pgmap->dev = dev; | ||
| 136 | if (!pgmap->ref) { | 135 | if (!pgmap->ref) { |
| 137 | if (pgmap->ops && (pgmap->ops->kill || pgmap->ops->cleanup)) | 136 | if (pgmap->ops && (pgmap->ops->kill || pgmap->ops->cleanup)) |
| 138 | return ERR_PTR(-EINVAL); | 137 | return ERR_PTR(-EINVAL); |