From patchwork Sun Aug 11 16:51:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 2842751 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 3C02DBF546 for ; Sun, 11 Aug 2013 17:25:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65A93201EC for ; Sun, 11 Aug 2013 17:25:12 +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 739D7201DC for ; Sun, 11 Aug 2013 17:25:11 +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 1V8YvA-00088Q-Ch; Sun, 11 Aug 2013 16:55:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8YuF-0005eL-LA; Sun, 11 Aug 2013 16:54:15 +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 1V8Ysq-0005Ql-AB for linux-arm-kernel@lists.infradead.org; Sun, 11 Aug 2013 16:52:49 +0000 X-IronPort-AV: E=Sophos;i="4.89,857,1367964000"; d="scan'208";a="23717957" 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:02 +0200 From: Julia Lawall To: Philipp Zabel Subject: [PATCH 13/16] arch/arm/mach-pxa/hx4700.c: Avoid using ARRAY_AND_SIZE(e) as a function argument Date: Sun, 11 Aug 2013 18:51:54 +0200 Message-Id: <1376239917-15594-14-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_125248_668110_6B1D0131 X-CRM114-Status: UNSURE ( 8.53 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.1 (------) Cc: Eric Miao , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Haojian Zhuang , Paul Parsons , 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/hx4700.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 133109e..8cac0a8 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c @@ -866,9 +866,9 @@ static void __init hx4700_init(void) PCFR = PCFR_GPR_EN | PCFR_OPDE; - pxa2xx_mfp_config(ARRAY_AND_SIZE(hx4700_pin_config)); + pxa2xx_mfp_config(hx4700_pin_config, ARRAY_SIZE(hx4700_pin_config)); gpio_set_wake(GPIO12_HX4700_ASIC3_IRQ, 1); - ret = gpio_request_array(ARRAY_AND_SIZE(global_gpios)); + ret = gpio_request_array(global_gpios, ARRAY_SIZE(global_gpios)); if (ret) pr_err ("hx4700: Failed to request GPIOs.\n"); @@ -882,10 +882,13 @@ static void __init hx4700_init(void) pxa_set_ficp_info(&ficp_info); pxa27x_set_i2c_power_info(NULL); pxa_set_i2c_info(NULL); - i2c_register_board_info(0, ARRAY_AND_SIZE(i2c_board_info)); - i2c_register_board_info(1, ARRAY_AND_SIZE(pi2c_board_info)); + i2c_register_board_info(0, i2c_board_info, + ARRAY_SIZE(i2c_board_info)); + i2c_register_board_info(1, pi2c_board_info, + ARRAY_SIZE(pi2c_board_info)); pxa2xx_set_spi_info(2, &pxa_ssp2_master_info); - spi_register_board_info(ARRAY_AND_SIZE(tsc2046_board_info)); + spi_register_board_info(tsc2046_board_info, + ARRAY_SIZE(tsc2046_board_info)); gpio_set_value(GPIO71_HX4700_ASIC3_nRESET, 0); mdelay(10);