From 705a5759f0d3ca32feb193c5fddfab3fdcf85c9b Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 31 Aug 2011 11:53:41 -0400 Subject: [PATCH] --- yaml --- r: 263639 b: refs/heads/master c: f020b007d5dd24597f5e985a6309bcb8393797ed h: refs/heads/master i: 263637: 57637e704f7503c8212faa468162e00f861e8a07 263635: 941f738749e34d69fddbd8aa7c111c20c7698252 263631: 14c763aa2923ced01d4b39c1df046fcbd6a1010b v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/pmbus/ucd9000.c | 6 ++---- trunk/drivers/hwmon/pmbus/ucd9200.c | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ba2474732d6a..aa64bad48b51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d91aae1e52e5289a94f4ddff968decfc8d37271e +refs/heads/master: f020b007d5dd24597f5e985a6309bcb8393797ed diff --git a/trunk/drivers/hwmon/pmbus/ucd9000.c b/trunk/drivers/hwmon/pmbus/ucd9000.c index ace1c7319734..d0ddb60155c9 100644 --- a/trunk/drivers/hwmon/pmbus/ucd9000.c +++ b/trunk/drivers/hwmon/pmbus/ucd9000.c @@ -141,13 +141,11 @@ static int ucd9000_probe(struct i2c_client *client, block_buffer[ret] = '\0'; dev_info(&client->dev, "Device ID %s\n", block_buffer); - mid = NULL; - for (i = 0; i < ARRAY_SIZE(ucd9000_id); i++) { - mid = &ucd9000_id[i]; + for (mid = ucd9000_id; mid->name[0]; mid++) { if (!strncasecmp(mid->name, block_buffer, strlen(mid->name))) break; } - if (!mid || !strlen(mid->name)) { + if (!mid->name[0]) { dev_err(&client->dev, "Unsupported device\n"); return -ENODEV; } diff --git a/trunk/drivers/hwmon/pmbus/ucd9200.c b/trunk/drivers/hwmon/pmbus/ucd9200.c index ffcc1cf3609d..c65e9da707cc 100644 --- a/trunk/drivers/hwmon/pmbus/ucd9200.c +++ b/trunk/drivers/hwmon/pmbus/ucd9200.c @@ -68,13 +68,11 @@ static int ucd9200_probe(struct i2c_client *client, block_buffer[ret] = '\0'; dev_info(&client->dev, "Device ID %s\n", block_buffer); - mid = NULL; - for (i = 0; i < ARRAY_SIZE(ucd9200_id); i++) { - mid = &ucd9200_id[i]; + for (mid = ucd9200_id; mid->name[0]; mid++) { if (!strncasecmp(mid->name, block_buffer, strlen(mid->name))) break; } - if (!mid || !strlen(mid->name)) { + if (!mid->name[0]) { dev_err(&client->dev, "Unsupported device\n"); return -ENODEV; }