Re: [PATCH] ARM: imx: fix imx_mmdc_probe build failure
From: Shawn Guo <shawnguo@kernel.org>
Date: 2021-07-23 14:03:38
Also in:
lkml
On Fri, Jul 23, 2021 at 11:14:42AM +0200, Arnd Bergmann wrote:
From: Arnd Bergmann <arnd@arndb.de>
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()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>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 hunk ↗ jump to hunk
--- arch/arm/mach-imx/mmdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c index 4a6f1359e1e9..5ee43acf3635 100644 --- a/arch/arm/mach-imx/mmdc.c +++ b/arch/arm/mach-imx/mmdc.c@@ -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)-- 2.29.2
_______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel