瀏覽代碼

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>
Kay Sievers 16 年之前
父節點
當前提交
739cf3a269
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/hwmon/hwmon.c
  2. 1 1
      drivers/hwmon/lm75.c

+ 1 - 1
drivers/hwmon/hwmon.c

@@ -76,7 +76,7 @@ void hwmon_device_unregister(struct device *dev)
 {
 {
 	int id;
 	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);
 		device_unregister(dev);
 		spin_lock(&idr_lock);
 		spin_lock(&idr_lock);
 		idr_remove(&hwmon_idr, id);
 		idr_remove(&hwmon_idr, id);

+ 1 - 1
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",
 	dev_info(&client->dev, "%s: sensor '%s'\n",
-		data->hwmon_dev->bus_id, client->name);
+		 dev_name(data->hwmon_dev), client->name);
 
 
 	return 0;
 	return 0;