diff options
| -rw-r--r-- | drivers/power/supply/rx51_battery.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/power/supply/rx51_battery.c b/drivers/power/supply/rx51_battery.c index d532c670661b..7cdcd415e868 100644 --- a/drivers/power/supply/rx51_battery.c +++ b/drivers/power/supply/rx51_battery.c @@ -197,8 +197,6 @@ static int rx51_battery_probe(struct platform_device *pdev) if (!di) return -ENOMEM; - platform_set_drvdata(pdev, di); - di->dev = &pdev->dev; di->bat_desc.name = "rx51-battery"; di->bat_desc.type = POWER_SUPPLY_TYPE_BATTERY; @@ -220,20 +218,13 @@ static int rx51_battery_probe(struct platform_device *pdev) if (IS_ERR(di->channel_vbat)) return PTR_ERR(di->channel_vbat); - di->bat = power_supply_register(di->dev, &di->bat_desc, &psy_cfg); + di->bat = devm_power_supply_register(di->dev, &di->bat_desc, &psy_cfg); if (IS_ERR(di->bat)) return PTR_ERR(di->bat); return 0; } -static void rx51_battery_remove(struct platform_device *pdev) -{ - struct rx51_device_info *di = platform_get_drvdata(pdev); - - power_supply_unregister(di->bat); -} - #ifdef CONFIG_OF static const struct of_device_id n900_battery_of_match[] = { {.compatible = "nokia,n900-battery", }, @@ -244,7 +235,6 @@ MODULE_DEVICE_TABLE(of, n900_battery_of_match); static struct platform_driver rx51_battery_driver = { .probe = rx51_battery_probe, - .remove_new = rx51_battery_remove, .driver = { .name = "rx51-battery", .of_match_table = of_match_ptr(n900_battery_of_match), |