arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument

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/)

// <smpl>
@@
expression e,f;
@@

f(...,
- ARRAY_AND_SIZE(e)
+ e,ARRAY_SIZE(e)
  ,...)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 6a6eb548307d10762b0f56307b81938842d180aa..e5cf841035832ec5f2163e36189f64aba5994c2b 100644 (file)
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -158,7 +158,8 @@ static void __init openrd_init(void)
        kirkwood_mpp_conf(openrd_mpp_config);
 
        kirkwood_uart0_init();
-       kirkwood_nand_init(ARRAY_AND_SIZE(openrd_nand_parts), 25);
+       kirkwood_nand_init(openrd_nand_parts, ARRAY_SIZE(openrd_nand_parts),
+                          25);
 
        kirkwood_ehci_init();
 

diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index d24223166e06c60e5d9631d6f8818f44bfb0fc5b..5154bd2a3ad3d581d727f946f08e83378d7e80a9 100644 (file)
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -87,7 +87,9 @@ static void __init rd88f6281_init(void)
        kirkwood_init();
        kirkwood_mpp_conf(rd88f6281_mpp_config);
 
-       kirkwood_nand_init(ARRAY_AND_SIZE(rd88f6281_nand_parts), 25);
+       kirkwood_nand_init(rd88f6281_nand_parts,
+                          ARRAY_SIZE(rd88f6281_nand_parts),
+                          25);
        kirkwood_ehci_init();
 
        kirkwood_ge00_init(&rd88f6281_ge00_data);