From patchwork Sun Aug 11 16:51:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 2842749 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E4302BF546 for ; Sun, 11 Aug 2013 17:19:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFDC72020E for ; Sun, 11 Aug 2013 17:19:14 +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 92DAA201B5 for ; Sun, 11 Aug 2013 17:19:13 +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 1V8Yvq-0000LZ-R3; Sun, 11 Aug 2013 16:55:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8Yuv-0005i1-LT; Sun, 11 Aug 2013 16:54:57 +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 1V8Ysu-0005Ql-99 for linux-arm-kernel@lists.infradead.org; Sun, 11 Aug 2013 16:52:54 +0000 X-IronPort-AV: E=Sophos;i="4.89,857,1367964000"; d="scan'208";a="23717960" 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:03 +0200 From: Julia Lawall To: Jonathan Cameron Subject: [PATCH 16/16] arch/arm/mach-pxa/stargate2.c: Avoid using ARRAY_AND_SIZE(e) as a function argument Date: Sun, 11 Aug 2013 18:51:57 +0200 Message-Id: <1376239917-15594-17-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_125252_687161_A56429E4 X-CRM114-Status: GOOD ( 10.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 Acked-by: Jonathan Cameron --- Not compiled. arch/arm/mach-pxa/stargate2.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index 62aea3e..adacedd 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c @@ -406,7 +406,8 @@ static struct i2c_pxa_platform_data i2c_pdata = { static void __init imote2_stargate2_init(void) { - pxa2xx_mfp_config(ARRAY_AND_SIZE(sg2_im2_unified_pin_config)); + pxa2xx_mfp_config(sg2_im2_unified_pin_config, + ARRAY_SIZE(sg2_im2_unified_pin_config)); pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); @@ -604,7 +605,7 @@ static struct platform_device *imote2_devices[] = { static void __init imote2_init(void) { - pxa2xx_mfp_config(ARRAY_AND_SIZE(imote2_pin_config)); + pxa2xx_mfp_config(imote2_pin_config, ARRAY_SIZE(imote2_pin_config)); imote2_stargate2_init(); @@ -983,13 +984,15 @@ static void __init stargate2_init(void) prior to connecting the MFP stuff up. */ __raw_writel(__raw_readl(MECR) & ~MECR_NOS, MECR); - pxa2xx_mfp_config(ARRAY_AND_SIZE(stargate2_pin_config)); + pxa2xx_mfp_config(stargate2_pin_config, + ARRAY_SIZE(stargate2_pin_config)); imote2_stargate2_init(); - platform_add_devices(ARRAY_AND_SIZE(stargate2_devices)); + platform_add_devices(stargate2_devices, ARRAY_SIZE(stargate2_devices)); - i2c_register_board_info(0, ARRAY_AND_SIZE(stargate2_i2c_board_info)); + i2c_register_board_info(0, stargate2_i2c_board_info, + ARRAY_SIZE(stargate2_i2c_board_info)); i2c_register_board_info(1, stargate2_pwr_i2c_board_info, ARRAY_SIZE(stargate2_pwr_i2c_board_info));