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=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 DE817C4338F for ; Fri, 23 Jul 2021 09:16:42 +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 ACD1C60EE6 for ; Fri, 23 Jul 2021 09:16:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ACD1C60EE6 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:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Y9KU5dfIojeRYocfDg2SopoND1h1NLkgYgZ1ls3tNk8=; b=BGBu9u5yulMxJ7 4HUb/4Q6+vQd8KsRehxSlqtDuvqmoQs08I1P9QjE+YOym4Rtk2zffL/u3ro/j4U18mh7960ZtAFFP uXY3y0N434MS3N/rWAWSjdmAvy0tW1U6zv2KRVgrL7GORccU4loDim+kNuIcq19QAjhWlVhIN3tG3 7sB255o8gKq3yCfTkv/bkj//fzOa9956kg7XTt3n+5m2MLClVLvWXqHcbA83nZefnx8/0M0GteWVg AegyD+j+BkCcAR0xG0f0KcQBOZZUXPwIFOWpT901PrqoEhe3Xc1zFjxRALGcMhL/7K0HpzFWs5/6V VcH431HBlRfH0vJCtOWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6rGl-0044uu-C2; Fri, 23 Jul 2021 09:14:59 +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 1m6rGh-0044rq-Do for linux-arm-kernel@lists.infradead.org; Fri, 23 Jul 2021 09:14:56 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1977E60EE6; Fri, 23 Jul 2021 09:14:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627031695; bh=PYhOjM3U3L4syjEUWh9E0orHuZlWWi7EO4f1NsfaMUY=; h=From:To:Cc:Subject:Date:From; b=fzCplF2Bjn1zy2jXPaVFy34fo7tJvXvCmCxshY+AVvr91nVh4fU70y1jghUwxBXSC zqFRxA2z5L1i5J3OOC1LtbfSUzyLZfp7VrkKmcKDpoAqEtak6q4b3tVfYeHxZPRfvn GHWDaHJArvcojTVVcDx0V6pECRTPsYyhtvA0Nkv8NWYdQknfdzXkAwmE/jzg9ofzjK iquDyxq/yTn+jPUGrso+SRxT4YEufS2jxElASw5lf3pM6T1ygruHh94itxxS9sw3yw miD0QMFNR2vgECSQXwVcnK2D1cqpvy6cOTxazSZbMuVfkRqb1KVVF3z4yk+7Iv3ns/ 2saRI1+zWKcHQ== From: Arnd Bergmann To: Russell King , Shawn Guo , Sascha Hauer , Dong Aisheng , Yang Yingliang Cc: Arnd Bergmann , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: imx: fix imx_mmdc_probe build failure Date: Fri, 23 Jul 2021 11:14:42 +0200 Message-Id: <20210723091450.1694746-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210723_021455_528151_B2B414D8 X-CRM114-Status: GOOD ( 14.62 ) 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 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 --- 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