lkml.org 
[lkml]   [2020]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFT v2 02/29] memory: omap-gpmc: Remove unused file-scope phys_base and mem_size
    Date
    The file-scope variables phys_base and mem_size are assigned in
    gpmc_probe() but never read.

    This fixes build error when compile testing on x86_64 architecture:

    drivers/memory/omap-gpmc.c:246:24: error: conflicting types for ‘phys_base’
    static resource_size_t phys_base, mem_size;
    In file included from arch/x86/include/asm/page.h:12:0,
    from arch/x86/include/asm/thread_info.h:12,
    from include/linux/thread_info.h:38,
    from arch/x86/include/asm/preempt.h:7,
    from include/linux/preempt.h:78,
    from include/linux/spinlock.h:51,
    from include/linux/irq.h:14,
    from drivers/memory/omap-gpmc.c:12:
    arch/x86/include/asm/page_64.h:12:22: note: previous declaration of ‘phys_base’ was here
    extern unsigned long phys_base;

    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    ---
    drivers/memory/omap-gpmc.c | 4 ----
    1 file changed, 4 deletions(-)

    diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
    index fc08b5292932..8ec2ef2aebdd 100644
    --- a/drivers/memory/omap-gpmc.c
    +++ b/drivers/memory/omap-gpmc.c
    @@ -242,7 +242,6 @@ static DEFINE_SPINLOCK(gpmc_mem_lock);
    /* Define chip-selects as reserved by default until probe completes */
    static unsigned int gpmc_cs_num = GPMC_CS_NUM;
    static unsigned int gpmc_nr_waitpins;
    -static resource_size_t phys_base, mem_size;
    static unsigned gpmc_capability;
    static void __iomem *gpmc_base;

    @@ -2357,9 +2356,6 @@ static int gpmc_probe(struct platform_device *pdev)
    if (res == NULL)
    return -ENOENT;

    - phys_base = res->start;
    - mem_size = resource_size(res);
    -
    gpmc_base = devm_ioremap_resource(&pdev->dev, res);
    if (IS_ERR(gpmc_base))
    return PTR_ERR(gpmc_base);
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-07-24 09:42    [W:2.524 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site