From patchwork Thu Feb 28 18:53:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 2199411 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id D03E7DF2A2 for ; Thu, 28 Feb 2013 19:22:01 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UB8zZ-0005xM-A6; Thu, 28 Feb 2013 19:18:09 +0000 Received: from mail.active-venture.com ([67.228.131.205]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UB8zV-0005x5-9E for linux-arm-kernel@lists.infradead.org; Thu, 28 Feb 2013 19:18:06 +0000 Received: (qmail 42051 invoked by uid 399); 28 Feb 2013 19:17:59 -0000 X-Virus-Scan: Scanned by ClamAV 0.97.2 (no viruses); Thu, 28 Feb 2013 13:17:59 -0600 Received: from unknown (HELO localhost) (guenter@roeck-us.net@108.223.40.66) by mail.active-venture.com with ESMTPAM; 28 Feb 2013 19:17:58 -0000 X-Originating-IP: 108.223.40.66 X-Sender: guenter@roeck-us.net From: Guenter Roeck To: linux-omap@vger.kernel.org Subject: [PATCH] arm/omap2: Fix build failures Date: Thu, 28 Feb 2013 10:53:03 -0800 Message-Id: <1362077583-11184-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.7.9.7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130228_141805_410879_C02A196D X-CRM114-Status: UNSURE ( 7.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tony Lindgren , Russell King , Guenter Roeck , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit c1d1cd59 (omap_device: remove obsolete pm_lats and early_device code) changed the number of parameters to omap_device_build(), but did not fix all calling code correctly. This causes build failures with some configurations. arch/arm/mach-omap2/devices.c: In function 'omap_init_hdmi_audio': arch/arm/mach-omap2/devices.c:429:2: error: too many arguments to function 'omap_device_build' arch/arm/mach-omap2/omap_device.h:74:25: note: declared here make[2]: [arch/arm/mach-omap2/devices.o] Error 1 (ignored) arch/arm/mach-omap2/sr_device.c: In function 'sr_dev_init': arch/arm/mach-omap2/sr_device.c:155:2: error: too many arguments to function 'omap_device_build' arch/arm/mach-omap2/omap_device.h:74:25: note: declared here make[2]: [arch/arm/mach-omap2/sr_device.o] Error 1 (ignored) arch/arm/mach-omap2/am35xx-emac.c: In function 'omap_davinci_emac_dev_init': arch/arm/mach-omap2/am35xx-emac.c:66:6: error: too many arguments to function 'omap_device_build' arch/arm/mach-omap2/omap_device.h:74:25: note: declared here Signed-off-by: Guenter Roeck --- arch/arm/mach-omap2/am35xx-emac.c | 3 +-- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/sr_device.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/am35xx-emac.c b/arch/arm/mach-omap2/am35xx-emac.c index a00d391..25b79a2 100644 --- a/arch/arm/mach-omap2/am35xx-emac.c +++ b/arch/arm/mach-omap2/am35xx-emac.c @@ -62,8 +62,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, { struct platform_device *pdev; - pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len, - false); + pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len); if (IS_ERR(pdev)) { WARN(1, "Can't build omap_device for %s:%s.\n", oh->class->name, oh->name); diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 142d9c6..1ec7f05 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -426,7 +426,7 @@ static void __init omap_init_hdmi_audio(void) return; } - pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0, 0); + pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0); WARN(IS_ERR(pdev), "Can't build omap_device for omap-hdmi-audio-dai.\n"); diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index bb829e0..d7bc33f 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c @@ -152,7 +152,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) sr_data->enable_on_init = sr_enable_on_init; - pdev = omap_device_build(name, i, oh, sr_data, sizeof(*sr_data), 0); + pdev = omap_device_build(name, i, oh, sr_data, sizeof(*sr_data)); if (IS_ERR(pdev)) pr_warning("%s: Could not build omap_device for %s: %s.\n\n", __func__, name, oh->name);