From patchwork Sat Aug 10 15:25:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 2842456 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 6A253BF546 for ; Sat, 10 Aug 2013 15:45:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 383A6202B3 for ; Sat, 10 Aug 2013 15:45:46 +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 5470D202AE for ; Sat, 10 Aug 2013 15:45:45 +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 1V8BMM-0008G4-R7; Sat, 10 Aug 2013 15:45:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8BMK-0007fn-GT; Sat, 10 Aug 2013 15:45:40 +0000 Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8BMH-0007fF-9j for linux-arm-kernel@lists.infradead.org; Sat, 10 Aug 2013 15:45:38 +0000 X-IronPort-AV: E=Sophos;i="4.89,851,1367964000"; d="scan'208";a="29005203" Received: from palace.lip6.fr (HELO localhost.localdomain) ([132.227.105.202]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 10 Aug 2013 17:25:58 +0200 From: Julia Lawall To: Jonathan Cameron Subject: [PATCH] arch/arm/mach-pxa/stargate2.c: use ARRAY_AND_SIZE consistently Date: Sat, 10 Aug 2013 17:25:53 +0200 Message-Id: <1376148353-9699-1-git-send-email-Julia.Lawall@lip6.fr> X-Mailer: git-send-email 1.7.8.6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130810_114537_570604_B7144982 X-CRM114-Status: UNSURE ( 9.02 ) 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 , 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=-4.2 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 Because ARRAY_AND_SIZE changes the apparent arity of a function, if it is used for one call to a given function, it would be better, if possible, to use it for all of them. The semantic patch that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // @call@ identifier f; expression e; expression list[n] es; @@ f(es,ARRAY_AND_SIZE(e),...) @@ expression e; identifier call.f; expression list[call.n] ess; @@ f(ess, - e,ARRAY_SIZE(e) + ARRAY_AND_SIZE(e) ,...) // Signed-off-by: Julia Lawall --- arch/arm/mach-pxa/stargate2.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index 62aea3e..ee7a42e 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c @@ -608,12 +608,10 @@ static void __init imote2_init(void) imote2_stargate2_init(); - platform_add_devices(imote2_devices, ARRAY_SIZE(imote2_devices)); + platform_add_devices(ARRAY_AND_SIZE(imote2_devices)); - i2c_register_board_info(0, imote2_i2c_board_info, - ARRAY_SIZE(imote2_i2c_board_info)); - i2c_register_board_info(1, imote2_pwr_i2c_board_info, - ARRAY_SIZE(imote2_pwr_i2c_board_info)); + i2c_register_board_info(0, ARRAY_AND_SIZE(imote2_i2c_board_info)); + i2c_register_board_info(1, ARRAY_AND_SIZE(imote2_pwr_i2c_board_info)); pxa_set_mci_info(&imote2_mci_platform_data); pxa_set_udc_info(&imote2_udc_info); @@ -990,8 +988,7 @@ static void __init stargate2_init(void) platform_add_devices(ARRAY_AND_SIZE(stargate2_devices)); i2c_register_board_info(0, ARRAY_AND_SIZE(stargate2_i2c_board_info)); - i2c_register_board_info(1, stargate2_pwr_i2c_board_info, - ARRAY_SIZE(stargate2_pwr_i2c_board_info)); + i2c_register_board_info(1, ARRAY_AND_SIZE(stargate2_pwr_i2c_board_info)); pxa_set_mci_info(&stargate2_mci_platform_data);