diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 19:44:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 19:44:38 +0100 |
| commit | ba88b0029fcdc39d23acd4d0e64b38145ffa4d5f (patch) | |
| tree | be4cdaa579a1ec3883b5ec25c0d98f2297cfd275 /drivers/power | |
| parent | serial: struct device - replace bus_id with dev_name(), dev_set_name() (diff) | |
| download | linux-ba88b0029fcdc39d23acd4d0e64b38145ffa4d5f.tar.xz linux-ba88b0029fcdc39d23acd4d0e64b38145ffa4d5f.zip | |
power-supply: struct device - replace bus_id with dev_name(), dev_set_name()
CC: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/ds2760_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index 308ddb201b66..1d768928e0bb 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c @@ -354,7 +354,7 @@ static int ds2760_battery_probe(struct platform_device *pdev) pdata = pdev->dev.platform_data; di->dev = &pdev->dev; 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.properties = 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) } 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) { retval = -ESRCH; goto workqueue_failed; |