[RFT,v2,02/29] memory: omap-gpmc: Remove unused file-scope phys_base and mem_size
diff mbox series

Message ID 20200724074038.5597-3-krzk@kernel.org
State New
Headers show
Series
  • *memory: Cleanup, improve and compile test memory drivers
Related show

Commit Message

Krzysztof Kozlowski July 24, 2020, 7:40 a.m. UTC
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(-)

Comments

Krzysztof Kozlowski Aug. 17, 2020, 6:31 p.m. UTC | #1
On Fri, Jul 24, 2020 at 09:40:11AM +0200, Krzysztof Kozlowski wrote:
> 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(-)

Applied to drivers/memory tree.

Best regards,
Krzysztof

Patch
diff mbox series

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);