From 0b7a4c4a539bb343752742471ac080ca30710373 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 14 Aug 2010 21:08:52 +0200 Subject: [PATCH] --- yaml --- r: 209423 b: refs/heads/master c: 28cbd461f022e30dba555926b76625a35e194166 h: refs/heads/master i: 209421: 6dcf1bb85aed8a392ab071d3c2b6074bb302fcad 209419: 852a3318a45bd9415308c2b9c80390c0c460c1d5 209415: 61a02fe62b3cfc7ffca186ab5c4eababe3a754aa 209407: 824dce00acc2d2c332c689c7ee55bcbb25e736e4 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/asc7621.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1d2ba26196d5..bb6eac942ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 738e5e05362bdbb31dbc270d31005c12cec8dbb2 +refs/heads/master: 28cbd461f022e30dba555926b76625a35e194166 diff --git a/trunk/drivers/hwmon/asc7621.c b/trunk/drivers/hwmon/asc7621.c index 3b973f30b1f6..89b4f3babe87 100644 --- a/trunk/drivers/hwmon/asc7621.c +++ b/trunk/drivers/hwmon/asc7621.c @@ -1150,9 +1150,6 @@ static int asc7621_detect(struct i2c_client *client, { struct i2c_adapter *adapter = client->adapter; int company, verstep, chip_index; - struct device *dev; - - dev = &client->dev; if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) return -ENODEV; @@ -1169,13 +1166,11 @@ static int asc7621_detect(struct i2c_client *client, if (company == asc7621_chips[chip_index].company_id && verstep == asc7621_chips[chip_index].verstep_id) { - strlcpy(client->name, asc7621_chips[chip_index].name, - I2C_NAME_SIZE); strlcpy(info->type, asc7621_chips[chip_index].name, I2C_NAME_SIZE); - dev_info(&adapter->dev, "Matched %s\n", - asc7621_chips[chip_index].name); + dev_info(&adapter->dev, "Matched %s at 0x%02x\n", + asc7621_chips[chip_index].name, client->addr); return 0; } }