This makes initialization, cleanup and look-up easier.
Signed-off-by: Jean Delvare <[email protected]>
Cc: Guenter Roeck <[email protected]>
---
This applies on top of Guenter's patch "i2c: stub: Add support for
SMBus block commands", v2.
drivers/i2c/i2c-stub.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- linux-3.16-rc3.orig/drivers/i2c/i2c-stub.c 2014-07-09 12:57:46.383772594
+0200
+++ linux-3.16-rc3/drivers/i2c/i2c-stub.c 2014-07-09 13:09:42.982241933
+0200
@@ -62,6 +62,7 @@ struct stub_chip {
};
static struct stub_chip *stub_chips;
+static int stub_chips_nr;
static struct smbus_block_data *stub_find_block(struct device *dev,
struct stub_chip *chip,
@@ -95,7 +96,7 @@ static s32 stub_xfer(struct i2c_adapter
struct smbus_block_data *b;
/* Search for the right chip */
- for (i = 0; i < MAX_CHIPS && chip_addr[i]; i++) {
+ for (i = 0; i < stub_chips_nr; i++) {
if (addr == chip_addr[i]) {
chip = stub_chips + i;
break;
@@ -281,12 +282,14 @@ static int __init i2c_stub_init(void)
}
/* Allocate memory for all chips at once */
- stub_chips = kzalloc(i * sizeof(struct stub_chip), GFP_KERNEL);
+ stub_chips_nr = i;
+ stub_chips = kcalloc(stub_chips_nr, sizeof(struct stub_chip),
+ GFP_KERNEL);
if (!stub_chips) {
pr_err("i2c-stub: Out of memory\n");
return -ENOMEM;
}
- for (i--; i >= 0; i--)
+ for (i = 0; i < stub_chips_nr; i++)
INIT_LIST_HEAD(&stub_chips[i].smbus_blocks);
ret = i2c_add_adapter(&stub_adapter);
--
Jean Delvare
SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
