diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:29:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:29:27 -0800 |
commit | b4669d66fb1488fd9cebe0b8da447cfeb86109ba (patch) | |
tree | 2beaba0e7d8acac9703667aff5f9bc9f4d4357d6 /drivers/i2c/busses/i2c-parport-light.c | |
parent | b43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf (diff) | |
parent | c5e3fbf22ccba0879b174fab7ec0e322b1266c2c (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/i2c/busses/i2c-parport-light.c')
-rw-r--r-- | drivers/i2c/busses/i2c-parport-light.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c index 3e5eba9fcac..c63025a4c86 100644 --- a/drivers/i2c/busses/i2c-parport-light.c +++ b/drivers/i2c/busses/i2c-parport-light.c @@ -121,14 +121,11 @@ static struct i2c_adapter parport_adapter = { 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; } |