From khali@linux-fr.org Mon Jan 9 14:22:08 2006 Date: Mon, 9 Jan 2006 23:19:51 +0100 From: Jean Delvare To: Greg KH Cc: Tobias Klauser Subject: i2c: Use ARRAY_SIZE macro Message-Id: <20060109231951.2b9634ff.khali@linux-fr.org> Content-Disposition: inline; filename=i2c-busses-use-array-size-macro.patch From: Tobias Klauser Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]). Some trailing whitespaces are also removed. Signed-off-by: Tobias Klauser Signed-off-by: Jean Delvare Cc: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-parport-light.c | 9 +++------ drivers/i2c/busses/i2c-parport.c | 7 ++----- drivers/i2c/busses/i2c-pxa.c | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) --- gregkh-2.6.orig/drivers/i2c/busses/i2c-parport.c +++ gregkh-2.6/drivers/i2c/busses/i2c-parport.c @@ -241,14 +241,11 @@ static struct parport_driver i2c_parport static int __init i2c_parport_init(void) { - int type_count; - - type_count = sizeof(adapter_parm)/sizeof(struct adapter_parm); - if (type < 0 || type >= type_count) { + if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) { printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type); type = 0; } - + return parport_register_driver(&i2c_parport_driver); } --- gregkh-2.6.orig/drivers/i2c/busses/i2c-parport-light.c +++ gregkh-2.6/drivers/i2c/busses/i2c-parport-light.c @@ -121,14 +121,11 @@ static struct i2c_adapter parport_adapte static int __init i2c_parport_init(void) { - int type_count; - - type_count = sizeof(adapter_parm)/sizeof(struct adapter_parm); - if (type < 0 || type >= type_count) { + if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) { printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type); type = 0; } - + if (base == 0) { printk(KERN_INFO "i2c-parport: using default base 0x%x\n", DEFAULT_BASE); base = DEFAULT_BASE; @@ -152,7 +149,7 @@ static int __init i2c_parport_init(void) release_region(base, 3); return -ENODEV; } - + return 0; } --- gregkh-2.6.orig/drivers/i2c/busses/i2c-pxa.c +++ gregkh-2.6/drivers/i2c/busses/i2c-pxa.c @@ -861,7 +861,7 @@ static irqreturn_t i2c_pxa_handler(int t decode_ISR(isr); } - if (i2c->irqlogidx < sizeof(i2c->isrlog)/sizeof(u32)) + if (i2c->irqlogidx < ARRAY_SIZE(i2c->isrlog)) i2c->isrlog[i2c->irqlogidx++] = isr; show_state(i2c);