From: Shawn Guo <shawnguo@kernel.org>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>,
Sascha Hauer <s.hauer@pengutronix.de>,
Dong Aisheng <aisheng.dong@nxp.com>,
Yang Yingliang <yangyingliang@huawei.com>,
Arnd Bergmann <arnd@arndb.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
NXP Linux Team <linux-imx@nxp.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: imx: fix imx_mmdc_probe build failure
Date: Fri, 23 Jul 2021 22:03:28 +0800 [thread overview]
Message-ID: <20210723140328.GA5901@dragon> (raw)
In-Reply-To: <20210723091450.1694746-1-arnd@kernel.org>
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
> ---
> 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
>
prev parent reply other threads:[~2021-07-23 14:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 9:14 [PATCH] ARM: imx: fix imx_mmdc_probe build failure Arnd Bergmann
2021-07-23 14:03 ` Shawn Guo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210723140328.GA5901@dragon \
--to=shawnguo@kernel.org \
--cc=aisheng.dong@nxp.com \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=s.hauer@pengutronix.de \
--cc=yangyingliang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox