Commit ba88b002 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman

power-supply: struct device - replace bus_id with dev_name(), dev_set_name()

CC: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4bfe090b
...@@ -354,7 +354,7 @@ static int ds2760_battery_probe(struct platform_device *pdev) ...@@ -354,7 +354,7 @@ static int ds2760_battery_probe(struct platform_device *pdev)
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
di->dev = &pdev->dev; di->dev = &pdev->dev;
di->w1_dev = pdev->dev.parent; di->w1_dev = pdev->dev.parent;
di->bat.name = pdev->dev.bus_id; di->bat.name = dev_name(&pdev->dev);
di->bat.type = POWER_SUPPLY_TYPE_BATTERY; di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
di->bat.properties = ds2760_battery_props; di->bat.properties = ds2760_battery_props;
di->bat.num_properties = ARRAY_SIZE(ds2760_battery_props); di->bat.num_properties = ARRAY_SIZE(ds2760_battery_props);
...@@ -371,7 +371,7 @@ static int ds2760_battery_probe(struct platform_device *pdev) ...@@ -371,7 +371,7 @@ static int ds2760_battery_probe(struct platform_device *pdev)
} }
INIT_DELAYED_WORK(&di->monitor_work, ds2760_battery_work); INIT_DELAYED_WORK(&di->monitor_work, ds2760_battery_work);
di->monitor_wqueue = create_singlethread_workqueue(pdev->dev.bus_id); di->monitor_wqueue = create_singlethread_workqueue(dev_name(&pdev->dev));
if (!di->monitor_wqueue) { if (!di->monitor_wqueue) {
retval = -ESRCH; retval = -ESRCH;
goto workqueue_failed; goto workqueue_failed;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment