[PATCH 1/5] ds2760_battery: remove APM code, now handled by apm_power driver

Much thanks to creators of apm_power: Eugeny Boger (implementation)
and Paul Sokolovsky (idea).

Signed-off-by: Anton Vorontsov <cbou_at_mail.ru>

---
 drivers/hwmon/battery/ds2760_battery.c |   45 --------------------------------
 include/linux/ds2760_battery.h         |    8 -----
 2 files changed, 0 insertions(+), 53 deletions(-)
diff --git a/drivers/hwmon/battery/ds2760_battery.c b/drivers/hwmon/battery/ds2760_battery.c
index 095dc69..3a12d73 100644
--- a/drivers/hwmon/battery/ds2760_battery.c
+++ b/drivers/hwmon/battery/ds2760_battery.c
@@ -28,8 +28,6 @@
 #include <linux/battery.h>
 #include <linux/ds2760_battery.h>
 
-#include <asm/apm.h>
-
 #include "../../w1/w1.h"
 
 #define to_ds2760_device_info(x) container_of((x), struct ds2760_device_info, \
@@ -72,7 +70,6 @@ static int ds2760_battery_get_min_voltage(struct battery *bat)
 static int ds2760_battery_get_voltage(struct battery *bat)
 {
 	struct ds2760_device_info *di = to_ds2760_device_info(bat);
-	ds2760_battery_read_status(di);
 	return di->voltage_mV;
 }
 
@@ -91,78 +88,39 @@ static int ds2760_battery_get_min_current(struct battery *bat)
 static int ds2760_battery_get_current(struct battery *bat)
 {
 	struct ds2760_device_info *di = to_ds2760_device_info(bat);
-	ds2760_battery_read_status(di);
 	return di->current_mA;
 }
 
 static int ds2760_battery_get_max_charge(struct battery *bat)
 {
 	struct ds2760_device_info *di = to_ds2760_device_info(bat);
-	ds2760_battery_read_status(di);
 	return di->full_active_mAh;
 }
 
 static int ds2760_battery_get_min_charge(struct battery *bat)
 {
 	struct ds2760_device_info *di = to_ds2760_device_info(bat);
-	ds2760_battery_read_status(di);
 	return di->empty_mAh;
 }
 
 static int ds2760_battery_get_charge(struct battery *bat)
 {
 	struct ds2760_device_info *di = to_ds2760_device_info(bat);
-	ds2760_battery_read_status(di);
 	return di->accum_current_mAh;
 }
 
 static int ds2760_battery_get_temp(struct battery *bat)
 {
 	struct ds2760_device_info *di = to_ds2760_device_info(bat);
-	ds2760_battery_read_status(di);
 	return di->temp_C;
 }
 
 static int ds2760_battery_get_status(struct battery *bat)
 {
 	struct ds2760_device_info *di = to_ds2760_device_info(bat);
-	ds2760_battery_update_status(di);
 	return di->charge_status;
 }
 
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-static int ds2760_get_apm_power_info(struct ds2760_device_info *di,
-                                      struct apm_power_info *info)
-{
-	ds2760_battery_read_status(di);
-
-	info->ac_line_status = (di->is_charge_power_supplied()) ?
-	                       APM_AC_ONLINE : APM_AC_OFFLINE;
-
-	if (info->ac_line_status == APM_AC_ONLINE && di->current_mA > 0)
-		info->battery_status = APM_BATTERY_STATUS_CHARGING;
-	else {
-		info->battery_status = di->rem_capacity > 75 ?
-		          APM_BATTERY_STATUS_HIGH :
-		      di->rem_capacity > 25 ?
-		          APM_BATTERY_STATUS_LOW : APM_BATTERY_STATUS_CRITICAL;
-	}
-
-	info->battery_flag = info->battery_status;
-
-	info->battery_life = di->rem_capacity;
-
-	if (di->current_mA) {
-		info->time = di->life_min;
-		info->units = APM_UNITS_MINS;
-	}
-	else
-		info->units = APM_UNITS_UNKNOWN;
-
-	return 0;
-}
-#endif /* CONFIG_APM */
-
 /* array is level at temps 0C, 10C, 20C, 30C, 40C
  *  * temp is in Celsius */
 static int
@@ -395,9 +353,6 @@ static int ds2760_battery_probe(struct platform_device *pdev)
 	di->charge_status = BATTERY_STATUS_UNKNOWN;
 
 	di->charge_power_changed = ds2760_battery_charge_power_changed;
-	#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-	di->get_apm_power_info = ds2760_get_apm_power_info;
-	#endif
 
 	retval = battery_class_register(&di->batt_cdev);
 	if (retval) goto batt_cdev_failed;
diff --git a/include/linux/ds2760_battery.h b/include/linux/ds2760_battery.h
index 5028a8b..a654c63 100644
--- a/include/linux/ds2760_battery.h
+++ b/include/linux/ds2760_battery.h
@@ -25,7 +25,6 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 #include <linux/battery.h>
-#include <asm/apm.h>
 #include "../drivers/w1/slaves/w1_ds2760.h"
 
 struct ds2760_device_info {
@@ -51,13 +50,6 @@ struct ds2760_device_info {
 	 * It will also called when driver is about to suspend or resume. */
 	void (*charge_callback)(const struct ds2760_device_info *di);
 
-
-	#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-	/* Call it to fill 'info' structure. */
-	int  (*get_apm_power_info)(struct ds2760_device_info *di,
-	                           struct apm_power_info *info);
-	#endif
-
 	/* DS2760 data, valid after calling ds2760_battery_read_status() */
         unsigned long update_time;          /* jiffies when data read */
         char    raw[DS2760_DATA_SIZE];      /* raw DS2760 data */
-- 
1.5.0.5-dirty