diff options
author | Jean Delvare <khali@linux-fr.org> | 2010-08-14 15:08:52 -0400 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2010-08-14 15:08:52 -0400 |
commit | 28cbd461f022e30dba555926b76625a35e194166 (patch) | |
tree | b5f4f40c39f8fd6cc84d247ad506985a8cd0dc23 /drivers/hwmon | |
parent | 738e5e05362bdbb31dbc270d31005c12cec8dbb2 (diff) |
hwmon: (asc7621) Clean up and improve detect function
* The dev variable is never used.
* Detect functions only need to set info->type, not client->name.
* Include the device address in the log message.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: George Joseph <george.joseph@fairview5.com>
Cc: Ken Milmore <ken.milmore@googlemail.com>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/asc7621.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c index 3b973f30b1f6..89b4f3babe87 100644 --- a/drivers/hwmon/asc7621.c +++ b/drivers/hwmon/asc7621.c | |||
@@ -1150,9 +1150,6 @@ static int asc7621_detect(struct i2c_client *client, | |||
1150 | { | 1150 | { |
1151 | struct i2c_adapter *adapter = client->adapter; | 1151 | struct i2c_adapter *adapter = client->adapter; |
1152 | int company, verstep, chip_index; | 1152 | int company, verstep, chip_index; |
1153 | struct device *dev; | ||
1154 | |||
1155 | dev = &client->dev; | ||
1156 | 1153 | ||
1157 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) | 1154 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) |
1158 | return -ENODEV; | 1155 | return -ENODEV; |
@@ -1169,13 +1166,11 @@ static int asc7621_detect(struct i2c_client *client, | |||
1169 | 1166 | ||
1170 | if (company == asc7621_chips[chip_index].company_id && | 1167 | if (company == asc7621_chips[chip_index].company_id && |
1171 | verstep == asc7621_chips[chip_index].verstep_id) { | 1168 | verstep == asc7621_chips[chip_index].verstep_id) { |
1172 | strlcpy(client->name, asc7621_chips[chip_index].name, | ||
1173 | I2C_NAME_SIZE); | ||
1174 | strlcpy(info->type, asc7621_chips[chip_index].name, | 1169 | strlcpy(info->type, asc7621_chips[chip_index].name, |
1175 | I2C_NAME_SIZE); | 1170 | I2C_NAME_SIZE); |
1176 | 1171 | ||
1177 | dev_info(&adapter->dev, "Matched %s\n", | 1172 | dev_info(&adapter->dev, "Matched %s at 0x%02x\n", |
1178 | asc7621_chips[chip_index].name); | 1173 | asc7621_chips[chip_index].name, client->addr); |
1179 | return 0; | 1174 | return 0; |
1180 | } | 1175 | } |
1181 | } | 1176 | } |