diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 13:44:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:44:41 -0500 |
commit | 739cf3a2691951a2d68baa275201a7e931fd50e9 (patch) | |
tree | 7a3d28345ef1d0f79e8ef3f58de823ea67457072 | |
parent | cd3ed6b4dd9e20aacaa5bd957ce1a65c90a0cbc4 (diff) |
hwmon: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/hwmon/hwmon.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/lm75.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 076a59cdabe9..e15c3e7b07e9 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c | |||
@@ -76,7 +76,7 @@ void hwmon_device_unregister(struct device *dev) | |||
76 | { | 76 | { |
77 | int id; | 77 | int id; |
78 | 78 | ||
79 | if (likely(sscanf(dev->bus_id, HWMON_ID_FORMAT, &id) == 1)) { | 79 | if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) { |
80 | device_unregister(dev); | 80 | device_unregister(dev); |
81 | spin_lock(&idr_lock); | 81 | spin_lock(&idr_lock); |
82 | idr_remove(&hwmon_idr, id); | 82 | idr_remove(&hwmon_idr, id); |
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 8f9595f2fb53..55bd87c15c9a 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c | |||
@@ -190,7 +190,7 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
190 | } | 190 | } |
191 | 191 | ||
192 | dev_info(&client->dev, "%s: sensor '%s'\n", | 192 | dev_info(&client->dev, "%s: sensor '%s'\n", |
193 | data->hwmon_dev->bus_id, client->name); | 193 | dev_name(data->hwmon_dev), client->name); |
194 | 194 | ||
195 | return 0; | 195 | return 0; |
196 | 196 | ||