diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-06 00:20:15 -0400 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-06-06 20:13:09 -0400 |
commit | ddeeb8f973bbe3bebac78e78c234ff18bfb00bf0 (patch) | |
tree | aabd503f293fa563134ceb97d4982ab1a3df332b /drivers/power | |
parent | 71c29b3a89ea49c1f07c85518a9e75bf530673cd (diff) |
ab8500_bm: Remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on
probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is
not needed to manually clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/ab8500_btemp.c | 1 | ||||
-rw-r--r-- | drivers/power/ab8500_charger.c | 2 | ||||
-rw-r--r-- | drivers/power/ab8500_fg.c | 1 | ||||
-rw-r--r-- | drivers/power/abx500_chargalg.c | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c index d412d34bf3df..7f9a4547dccd 100644 --- a/drivers/power/ab8500_btemp.c +++ b/drivers/power/ab8500_btemp.c | |||
@@ -1045,7 +1045,6 @@ static int ab8500_btemp_remove(struct platform_device *pdev) | |||
1045 | 1045 | ||
1046 | flush_scheduled_work(); | 1046 | flush_scheduled_work(); |
1047 | power_supply_unregister(&di->btemp_psy); | 1047 | power_supply_unregister(&di->btemp_psy); |
1048 | platform_set_drvdata(pdev, NULL); | ||
1049 | 1048 | ||
1050 | return 0; | 1049 | return 0; |
1051 | } | 1050 | } |
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index a558318b169c..f098fdafee9f 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c | |||
@@ -3425,8 +3425,6 @@ static int ab8500_charger_remove(struct platform_device *pdev) | |||
3425 | if (di->ac_chg.enabled && !di->ac_chg.external) | 3425 | if (di->ac_chg.enabled && !di->ac_chg.external) |
3426 | power_supply_unregister(&di->ac_chg.psy); | 3426 | power_supply_unregister(&di->ac_chg.psy); |
3427 | 3427 | ||
3428 | platform_set_drvdata(pdev, NULL); | ||
3429 | |||
3430 | return 0; | 3428 | return 0; |
3431 | } | 3429 | } |
3432 | 3430 | ||
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index c5391f5c372d..1263638b102d 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c | |||
@@ -3070,7 +3070,6 @@ static int ab8500_fg_remove(struct platform_device *pdev) | |||
3070 | flush_scheduled_work(); | 3070 | flush_scheduled_work(); |
3071 | ab8500_fg_sysfs_psy_remove_attrs(di->fg_psy.dev); | 3071 | ab8500_fg_sysfs_psy_remove_attrs(di->fg_psy.dev); |
3072 | power_supply_unregister(&di->fg_psy); | 3072 | power_supply_unregister(&di->fg_psy); |
3073 | platform_set_drvdata(pdev, NULL); | ||
3074 | return ret; | 3073 | return ret; |
3075 | } | 3074 | } |
3076 | 3075 | ||
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c index 9863e423602c..6d2723664a01 100644 --- a/drivers/power/abx500_chargalg.c +++ b/drivers/power/abx500_chargalg.c | |||
@@ -2035,7 +2035,6 @@ static int abx500_chargalg_remove(struct platform_device *pdev) | |||
2035 | destroy_workqueue(di->chargalg_wq); | 2035 | destroy_workqueue(di->chargalg_wq); |
2036 | 2036 | ||
2037 | power_supply_unregister(&di->chargalg_psy); | 2037 | power_supply_unregister(&di->chargalg_psy); |
2038 | platform_set_drvdata(pdev, NULL); | ||
2039 | 2038 | ||
2040 | return 0; | 2039 | return 0; |
2041 | } | 2040 | } |