diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-04-28 04:55:00 -0400 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2009-06-08 15:24:53 -0400 |
commit | ae9fb6e814ecede683bcd404910085cea3ab1260 (patch) | |
tree | cc11181bc63d4c9169a29156226ef63a909803ef /drivers/power/ds2760_battery.c | |
parent | ccc0d38ec13d4649d4168c1db590137df53ad783 (diff) |
ds2760_battery: cleanups in ds2760_battery_probe()
Removed struct ds2760_platform_data which wasn't defined anywhere.
Indentation cleanups.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
Acked-by: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power/ds2760_battery.c')
-rw-r--r-- | drivers/power/ds2760_battery.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index a52d4a11652d..9331009090f1 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c | |||
@@ -344,7 +344,6 @@ static int ds2760_battery_probe(struct platform_device *pdev) | |||
344 | { | 344 | { |
345 | int retval = 0; | 345 | int retval = 0; |
346 | struct ds2760_device_info *di; | 346 | struct ds2760_device_info *di; |
347 | struct ds2760_platform_data *pdata; | ||
348 | 347 | ||
349 | di = kzalloc(sizeof(*di), GFP_KERNEL); | 348 | di = kzalloc(sizeof(*di), GFP_KERNEL); |
350 | if (!di) { | 349 | if (!di) { |
@@ -354,14 +353,13 @@ static int ds2760_battery_probe(struct platform_device *pdev) | |||
354 | 353 | ||
355 | platform_set_drvdata(pdev, di); | 354 | platform_set_drvdata(pdev, di); |
356 | 355 | ||
357 | pdata = pdev->dev.platform_data; | 356 | di->dev = &pdev->dev; |
358 | di->dev = &pdev->dev; | 357 | di->w1_dev = pdev->dev.parent; |
359 | di->w1_dev = pdev->dev.parent; | 358 | di->bat.name = dev_name(&pdev->dev); |
360 | di->bat.name = dev_name(&pdev->dev); | 359 | di->bat.type = POWER_SUPPLY_TYPE_BATTERY; |
361 | di->bat.type = POWER_SUPPLY_TYPE_BATTERY; | 360 | di->bat.properties = ds2760_battery_props; |
362 | di->bat.properties = ds2760_battery_props; | 361 | di->bat.num_properties = ARRAY_SIZE(ds2760_battery_props); |
363 | di->bat.num_properties = ARRAY_SIZE(ds2760_battery_props); | 362 | di->bat.get_property = ds2760_battery_get_property; |
364 | di->bat.get_property = ds2760_battery_get_property; | ||
365 | di->bat.external_power_changed = | 363 | di->bat.external_power_changed = |
366 | ds2760_battery_external_power_changed; | 364 | ds2760_battery_external_power_changed; |
367 | 365 | ||