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>

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index 076a59cdabe9f7a205cedd3883d40416e2e9b9c7..e15c3e7b07e9a1e2314e29090750fd51abadfde7 100644 (file)
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -76,7 +76,7 @@ void hwmon_device_unregister(struct device *dev)
 {
        int id;
 
-       if (likely(sscanf(dev->bus_id, HWMON_ID_FORMAT, &id) == 1)) {
+       if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) {
                device_unregister(dev);
                spin_lock(&idr_lock);
                idr_remove(&hwmon_idr, id);

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 8f9595f2fb5322692e1144dea338c390da73946a..55bd87c15c9a56bf55971ab31d4173fe1b6842d9 100644 (file)
--- 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)
        }
 
        dev_info(&client->dev, "%s: sensor '%s'\n",
-               data->hwmon_dev->bus_id, client->name);
+                dev_name(data->hwmon_dev), client->name);
 
        return 0;