From patchwork Sun Aug 11 16:51:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 2842737 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0842D9F239 for ; Sun, 11 Aug 2013 16:54:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 265D720211 for ; Sun, 11 Aug 2013 16:54:16 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 037762020F for ; Sun, 11 Aug 2013 16:54:15 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8YtT-00078b-Kc; Sun, 11 Aug 2013 16:53:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8YtC-0005ZK-Tz; Sun, 11 Aug 2013 16:53:10 +0000 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8Ysc-0005Ql-H8 for linux-arm-kernel@lists.infradead.org; Sun, 11 Aug 2013 16:52:37 +0000 X-IronPort-AV: E=Sophos;i="4.89,857,1367964000"; d="scan'208";a="23717950" Received: from palace.lip6.fr (HELO localhost.localdomain) ([132.227.105.202]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 11 Aug 2013 18:52:01 +0200 From: Julia Lawall To: Marek Vasut Subject: [PATCH 6/16] arch/arm/mach-pxa: Avoid using ARRAY_AND_SIZE(e) as a function argument Date: Sun, 11 Aug 2013 18:51:47 +0200 Message-Id: <1376239917-15594-7-git-send-email-Julia.Lawall@lip6.fr> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1376239917-15594-1-git-send-email-Julia.Lawall@lip6.fr> References: <1376239917-15594-1-git-send-email-Julia.Lawall@lip6.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130811_125234_842382_0925950B X-CRM114-Status: GOOD ( 11.39 ) X-Spam-Score: -6.1 (------) Cc: Eric Miao , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Haojian Zhuang , Russell King , 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 X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Julia Lawall Replace ARRAY_AND_SIZE(e) in function argument position to avoid hiding the arity of the called function. The semantic match that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression e,f; @@ f(..., - ARRAY_AND_SIZE(e) + e,ARRAY_SIZE(e) ,...) // Signed-off-by: Julia Lawall --- Not compiled. arch/arm/mach-pxa/palmld.c | 2 +- arch/arm/mach-pxa/palmt5.c | 2 +- arch/arm/mach-pxa/palmtc.c | 2 +- arch/arm/mach-pxa/palmte2.c | 7 ++++--- arch/arm/mach-pxa/palmtx.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index cf210b1..4e3016a 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c @@ -322,7 +322,7 @@ static void __init palmld_map_io(void) static void __init palmld_init(void) { - pxa2xx_mfp_config(ARRAY_AND_SIZE(palmld_pin_config)); + pxa2xx_mfp_config(palmld_pin_config, ARRAY_SIZE(palmld_pin_config)); pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 3ed9b02..c054003 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c @@ -184,7 +184,7 @@ static void __init palmt5_reserve(void) static void __init palmt5_init(void) { - pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config)); + pxa2xx_mfp_config(palmt5_pin_config, ARRAY_SIZE(palmt5_pin_config)); pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index 100b176..aea2e19 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c @@ -517,7 +517,7 @@ static inline void palmtc_lcd_init(void) {} ******************************************************************************/ static void __init palmtc_init(void) { - pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtc_pin_config)); + pxa2xx_mfp_config(palmtc_pin_config, ARRAY_SIZE(palmtc_pin_config)); pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c index 0742721..6cfd6b0 100644 --- a/arch/arm/mach-pxa/palmte2.c +++ b/arch/arm/mach-pxa/palmte2.c @@ -145,7 +145,8 @@ static struct gpio palmte_bl_gpios[] = { static int palmte2_backlight_init(struct device *dev) { - return gpio_request_array(ARRAY_AND_SIZE(palmte_bl_gpios)); + return gpio_request_array(palmte_bl_gpios, + ARRAY_SIZE(palmte_bl_gpios)); } static int palmte2_backlight_notify(struct device *dev, int brightness) @@ -157,7 +158,7 @@ static int palmte2_backlight_notify(struct device *dev, int brightness) static void palmte2_backlight_exit(struct device *dev) { - gpio_free_array(ARRAY_AND_SIZE(palmte_bl_gpios)); + gpio_free_array(palmte_bl_gpios, ARRAY_SIZE(palmte_bl_gpios)); } static struct platform_pwm_backlight_data palmte2_backlight_data = { @@ -342,7 +343,7 @@ static void __init palmte2_udc_init(void) static void __init palmte2_init(void) { - pxa2xx_mfp_config(ARRAY_AND_SIZE(palmte2_pin_config)); + pxa2xx_mfp_config(palmte2_pin_config, ARRAY_SIZE(palmte2_pin_config)); pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 83f830d..750ff97 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c @@ -341,7 +341,7 @@ static void __init palmtx_map_io(void) static void __init palmtx_init(void) { - pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config)); + pxa2xx_mfp_config(palmtx_pin_config, ARRAY_SIZE(palmtx_pin_config)); pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL);