leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] i2c: Use ARRAY_SIZE macro

Browse Source 
Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]). Some trailing
whitespaces are also removed.

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tobias Klauser 2006-01-09 23:19:51 +01:00 committed by Greg Kroah-Hartman
parent 8104a9a9c9
commit 7e3d7db524
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/i2c/busses/i2c-parport-light.c
View File

@ -121,10 +121,7 @@ static struct i2c_adapter parport_adapter = {
static int __init i2c_parport_init(void) static int __init i2c_parport_init(void)
{ {
int type_count; if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) {
type_count = sizeof(adapter_parm)/sizeof(struct adapter_parm);
if (type < 0 || type >= type_count) {
printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type); printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
type = 0; type = 0;
} }

5
drivers/i2c/busses/i2c-parport.c
View File

@ -241,10 +241,7 @@ static struct parport_driver i2c_parport_driver = {
static int __init i2c_parport_init(void) static int __init i2c_parport_init(void)
{ {
int type_count; if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) {
type_count = sizeof(adapter_parm)/sizeof(struct adapter_parm);
if (type < 0 || type >= type_count) {
printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type); printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
type = 0; type = 0;
} }

2
drivers/i2c/busses/i2c-pxa.c
View File

@ -861,7 +861,7 @@ static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id, struct pt_regs *r
decode_ISR(isr); decode_ISR(isr);
} }
if (i2c->irqlogidx < sizeof(i2c->isrlog)/sizeof(u32)) if (i2c->irqlogidx < ARRAY_SIZE(i2c->isrlog))
i2c->isrlog[i2c->irqlogidx++] = isr; i2c->isrlog[i2c->irqlogidx++] = isr;
show_state(i2c); show_state(i2c);