From: Julia Lawall <Julia.Lawall@xxxxxxx> 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/) // <smpl> @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) ,...) // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx> --- 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); -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
