From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-22.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DE31C4338F for ; Fri, 23 Jul 2021 14:05:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1877F60E9C for ; Fri, 23 Jul 2021 14:05:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1877F60E9C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tWd0k0yNAuOnC+hvJGw5Chyud2W0F/8tsRB+fh60jFE=; b=0pCGgdfZGw4fp3 0bPgRMLJDntqJOWPVbsbUU31fewM8Qxrr8F+EsPXepo6jNu4+4sfh6iAdSbA9WWVYIucN13xqKSNR eYtIFFUUpnJTawIDgbkAQ/iFQS8Z+oQbkTB1vU3ca2hbSCAfPM9QhgzrdG7V7zQBPFr411FSp469b 1T3tbIFQlOTSGRKtxJMlUtKvK/GfiUnz0+PffbbxfPEEmtrQJLk1ONn1CY7bAp75iRbmB32MgAB9d xNR+guFcO8YkFwhRVE++hSmROm94wlKQr2jkFUS56woCl8aSp+8eN1JKZJrBEydBXThZPPlMcvk9z FMV/gwQz/Lw/6lulWmuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6vm9-004xYi-Mu; Fri, 23 Jul 2021 14:03:41 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6vm3-004xY3-2H for linux-arm-kernel@lists.infradead.org; Fri, 23 Jul 2021 14:03:39 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id C37B260EE6; Fri, 23 Jul 2021 14:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627049014; bh=mDaV0aRlSDpaHYmvF8eJe6sIGjdm2h+Js4Gj2SK/RqQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dxX6K7fOmR817Ob8ThUFX4JcX62Bx7B6ItE27AfrtvrPnLQvvFgXq+nO3oBz+v/DI UPfINvUVg4OgB0U9AVTeHIj+CrWdLwPITsKgHoh1blKUMhsv8NhqX6SoqNJqLjqnQb Grd7RKcH/bKkDJrWr0gtiT4pBS7VvTpNdKKgkV+GIdz/XPR89nuchVHfT9Cso0jY4b C6TGkUWVngDfPs0oUgPS0mvwFRwzwVX2bK7VojOfy4LE8TC5nLeGRkQb30h6J7cbNa b+e05n+zL91gHuOF5WEgpo5wzSYyQ3bwp6rFFa6BQnickmoRSW+/qJJtwYmArww88D GKSoIx1FjnVHA== Date: Fri, 23 Jul 2021 22:03:28 +0800 From: Shawn Guo To: Arnd Bergmann Cc: Russell King , Sascha Hauer , Dong Aisheng , Yang Yingliang , Arnd Bergmann , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: imx: fix imx_mmdc_probe build failure Message-ID: <20210723140328.GA5901@dragon> References: <20210723091450.1694746-1-arnd@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210723091450.1694746-1-arnd@kernel.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210723_070335_172547_F1C499A1 X-CRM114-Status: GOOD ( 21.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jul 23, 2021 at 11:14:42AM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann > > 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 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel