Skip to contentSkip to conversation

ARM: imx: fix imx_mmdc_probe build failure

PATCH In review Arnd Bergmann 2 participants 2 messages Jul 23, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: imx: fix imx_mmdc_probe build failure

From: Arnd Bergmann <[email protected]>

There are two definitions of imx_mmdc_probe(), the function just gained a third argument, but the empty macro did not get changed the same way:

arch/arm/mach-imx/mmdc.c: In function 'imx_mmdc_probe':
arch/arm/mach-imx/mmdc.c:575:63: error: macro "imx_mmdc_perf_init" passed 3 arguments, but takes just 2
575 | err = imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk);
| ^
arch/arm/mach-imx/mmdc.c:537: note: macro "imx_mmdc_perf_init" defined here
537 | #define imx_mmdc_perf_init(pdev, mmdc_base) 0

      |
arch/arm/mach-imx/mmdc.c:575:15: error: 'imx_mmdc_perf_init' undeclared (first use in this function)
  575 |         err = imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk);
      |               ^~~~~~~~~~~~~~~~~~
Fixes f07ec8536580 ("ARM: imx: add missing clk_disable_unprepare()")
---
 arch/arm/mach-imx/mmdc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/mmdc.c +1 -1
index 4a6f1359e1e9..5ee43acf3635 100644
@@ -534,7 +534,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
 
 #else
 #define imx_mmdc_remove NULL
-#define imx_mmdc_perf_init(pdev, mmdc_base) 0
+#define imx_mmdc_perf_init(pdev, mmdc_base, ipg_clk) 0
 #endif
 
 static int imx_mmdc_probe(struct platform_device *pdev)
Signature · 1 line
2.29.2
#1 lore raw
Quoted 12 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

There are two definitions of imx_mmdc_probe(), the function just gained a third argument, but the empty macro did not get changed the same way:

arch/arm/mach-imx/mmdc.c: In function 'imx_mmdc_probe':
arch/arm/mach-imx/mmdc.c:575:63: error: macro "imx_mmdc_perf_init" passed 3 arguments, but takes just 2
575 | err = imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk);
| ^
arch/arm/mach-imx/mmdc.c:537: note: macro "imx_mmdc_perf_init" defined here
537 | #define imx_mmdc_perf_init(pdev, mmdc_base) 0

Quoted 7 lines
      |
arch/arm/mach-imx/mmdc.c:575:15: error: 'imx_mmdc_perf_init' undeclared (first use in this function)
  575 |         err = imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk);
      |               ^~~~~~~~~~~~~~~~~~
Fixes f07ec8536580 ("ARM: imx: add missing clk_disable_unprepare()")

Thanks for the patch, Arnd. I already queued up the fix from Colin Ian King [1] for this issue.

Shawn

[1] https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git/commit/?h=imx/fixes&id=20fb73911fec01f06592de1cdbca00b66602ebd7

Quoted 20 lines
---
 arch/arm/mach-imx/mmdc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/mmdc.c +1 -1
index 4a6f1359e1e9..5ee43acf3635 100644
@@ -534,7 +534,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
 
 #else
 #define imx_mmdc_remove NULL
-#define imx_mmdc_perf_init(pdev, mmdc_base) 0
+#define imx_mmdc_perf_init(pdev, mmdc_base, ipg_clk) 0
 #endif
 
 static int imx_mmdc_probe(struct platform_device *pdev)
Signature · 1 line
2.29.2