wm97xx_batt: Remove deprecated method to set pdata
PATCH 1/1 wm97xx_batt: Remove deprecated method to set pdata
Signed-off-by Marek Vasut <[email protected]>
--- drivers/power/wm97xx_battery.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
drivers/power/wm97xx_battery.c +0 -16
@@ -29,7 +29,6 @@ static DEFINE_MUTEX(bat_lock);static struct work_struct bat_work;static struct mutex work_lock;static int bat_status =POWER_SUPPLY_STATUS_UNKNOWN ; -static struct wm97xx_batt_info *gpdata;static enum power_supply_property *prop;static unsigned long wm97xx_read_bat (struct power_supply *bat_ps)
@@ -172,12 +171,6 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)struct wm97xx_pdata *wmdata = dev->dev.platform_data;struct wm97xx_batt_pdata *pdata; -if (gpdata) { -dev_err (&dev->dev,"Do not pass platform_data through " -"wm97xx_bat_set_pdata!\n" ); -return -EINVAL ; - } -if (!wmdata) {dev_err (&dev->dev,"No platform data supplied\n" );return -EINVAL ;
@@ -308,15 +301,6 @@ static void __exit wm97xx_bat_exit(void)platform_driver_unregister (&wm97xx_bat_driver); } -/* The interface is deprecated, as well as linux/wm97xx_batt.h */ -void wm97xx_bat_set_pdata (struct wm97xx_batt_info *data); - -void wm97xx_bat_set_pdata (struct wm97xx_batt_info *data) -{ - gpdata = data; -} -EXPORT_SYMBOL_GPL (wm97xx_bat_set_pdata); -module_init (wm97xx_bat_init);module_exit (wm97xx_bat_exit);
Signature · 1 line
1.7.1
PATCH 1/1 wm97xx_batt: Remove deprecated method to set pdata
Quoted 1 line · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>
Acked-by Mark Brown <[email protected]>
PATCH 1/1 wm97xx_batt: Remove deprecated method to set pdata
Quoted 5 lines · Mark Brown
Quoted 1 line · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>Acked-by Mark Brown <[email protected]>
Thanks. Applied.
PATCH 1/1 wm97xx_batt: Remove deprecated method to set pdata
Dne Ne 13. ?ervna 2010 04:33:11 Eric Miao napsal(a):
Quoted 9 lines
On Sun, Jun 13, 2010 at 1:21 AM, Mark Brown
Quoted 4 lines · <[email protected]> wrote:
Quoted 1 line · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>Acked-by Mark Brown <[email protected]>Thanks. Applied.
Please also apply the other one (the one removing linux/wm97xx_batt.h)
Thanks!
PATCH 1/1 wm97xx_batt: Remove deprecated method to set pdata
Quoted 4 lines · Marek Vasut
Dne Ne 13. ?ervna 2010 04:33:11 Eric Miao napsal(a):
Quoted 3 lines
On Sun, Jun 13, 2010 at 1:21 AM, Mark Brown
<[email protected]> wrote:
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines · Marek Vasut
Quoted 1 line
Signed-off-by Marek Vasut <[email protected]>Acked-by Mark Brown <[email protected]>Thanks. Applied.
Please also apply the other one (the one removing
linux/wm97xx_batt.h)
They are merged.