diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 13:44:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:44:38 -0500 |
commit | ba88b0029fcdc39d23acd4d0e64b38145ffa4d5f (patch) | |
tree | be4cdaa579a1ec3883b5ec25c0d98f2297cfd275 | |
parent | 4bfe090b0a29258eeeb026a09a96cf5b5838ac63 (diff) |
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>
-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) | |||
354 | pdata = pdev->dev.platform_data; | 354 | pdata = pdev->dev.platform_data; |
355 | di->dev = &pdev->dev; | 355 | di->dev = &pdev->dev; |
356 | di->w1_dev = pdev->dev.parent; | 356 | di->w1_dev = pdev->dev.parent; |
357 | di->bat.name = pdev->dev.bus_id; | 357 | di->bat.name = dev_name(&pdev->dev); |
358 | di->bat.type = POWER_SUPPLY_TYPE_BATTERY; | 358 | di->bat.type = POWER_SUPPLY_TYPE_BATTERY; |
359 | di->bat.properties = ds2760_battery_props; | 359 | di->bat.properties = ds2760_battery_props; |
360 | di->bat.num_properties = ARRAY_SIZE(ds2760_battery_props); | 360 | di->bat.num_properties = ARRAY_SIZE(ds2760_battery_props); |
@@ -371,7 +371,7 @@ static int ds2760_battery_probe(struct platform_device *pdev) | |||
371 | } | 371 | } |
372 | 372 | ||
373 | INIT_DELAYED_WORK(&di->monitor_work, ds2760_battery_work); | 373 | INIT_DELAYED_WORK(&di->monitor_work, ds2760_battery_work); |
374 | di->monitor_wqueue = create_singlethread_workqueue(pdev->dev.bus_id); | 374 | di->monitor_wqueue = create_singlethread_workqueue(dev_name(&pdev->dev)); |
375 | if (!di->monitor_wqueue) { | 375 | if (!di->monitor_wqueue) { |
376 | retval = -ESRCH; | 376 | retval = -ESRCH; |
377 | goto workqueue_failed; | 377 | goto workqueue_failed; |