lkml.org 
[lkml]   [2019]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/5] memremap: remove the dev field in struct dev_pagemap
    Date
    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.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    include/linux/memremap.h | 1 -
    mm/memremap.c | 6 +-----
    mm/page_alloc.c | 2 +-
    3 files changed, 2 insertions(+), 7 deletions(-)

    diff --git a/include/linux/memremap.h b/include/linux/memremap.h
    index f8a5b2a19945..8f0013e18e14 100644
    --- 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/mm/memremap.c b/mm/memremap.c
    index 6ee03a816d67..600a14cbe663 100644
    --- a/mm/memremap.c
    +++ b/mm/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 272c6de1bf4e..b39baa2b1faf 100644
    --- 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));
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-11 10:13    [W:4.742 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site