[8/16] arch/arm/mach-pxa/palmz72.c: Avoid using ARRAY_AND_SIZE(e) as a function argument

Commit Message

Julia Lawall Aug. 11, 2013, 4:51 p.m. UTC

From: Julia Lawall <[e-mail]>

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 <[e-mail]>

---
Not compiled.

 arch/arm/mach-pxa/palmz72.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c
index 1a35ddf..5f8fd00 100644
--- a/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@ -356,9 +356,11 @@  static inline void __init palmz72_cam_gpio_init(void)
 {
 	int ret;
 
-	ret = gpio_request_array(ARRAY_AND_SIZE(palmz72_camera_gpios));
+	ret = gpio_request_array(palmz72_camera_gpios,
+				 ARRAY_SIZE(palmz72_camera_gpios));
 	if (!ret)
-		gpio_free_array(ARRAY_AND_SIZE(palmz72_camera_gpios));
+		gpio_free_array(palmz72_camera_gpios,
+				ARRAY_SIZE(palmz72_camera_gpios));
 	else
 		printk(KERN_ERR "Camera GPIO init failed!\n");
 
@@ -381,7 +383,7 @@  static inline void palmz72_camera_init(void) {}
  ******************************************************************************/
 static void __init palmz72_init(void)
 {
-	pxa2xx_mfp_config(ARRAY_AND_SIZE(palmz72_pin_config));
+	pxa2xx_mfp_config(palmz72_pin_config, ARRAY_SIZE(palmz72_pin_config));
 	pxa_set_ffuart_info(NULL);
 	pxa_set_btuart_info(NULL);
 	pxa_set_stuart_info(NULL);