Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aa9a2cb authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao
Browse files

[ARM] wm97xx_batt: remove now useless header file 



Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 241cf473

drivers/power/wm97xx_battery.c

+0 −16
Original line number Diff line number Diff line
@@ -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);

include/linux/wm97xx_batt.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
#ifndef _LINUX_WM97XX_BAT_H

#define _LINUX_WM97XX_BAT_H



#include <linux/wm97xx.h>



#warning This file will be removed soon, use wm97xx.h instead!



#define wm97xx_batt_info wm97xx_batt_pdata



#ifdef CONFIG_BATTERY_WM97XX

void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);

#else

static inline void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data) {}

#endif



#endif