2 files changed, 0 insertions, 27 deletions

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index fde5805fdab0..87ddc658413f 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -16,16 +16,12 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
-#include <linux/completion.h>
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
-#include <linux/kobject.h>
-#include <linux/mfd/abx500.h>
 #include <linux/mfd/abx500/ab8500.h>
 #include <linux/mfd/abx500/ab8500-bm.h>
-#include <linux/mfd/abx500/ab8500-gpadc.h>
 #include <linux/mfd/abx500/ux500_chargalg.h>
 #include <linux/pm2301_charger.h>
 #include <linux/gpio.h>
@@ -1018,7 +1014,6 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
 
         /* get parent data */
         pm2->dev = &i2c_client->dev;
-        pm2->gpadc = ab8500_gpadc_get("ab8500-gpadc.0");
 
         pm2->pm2_int = &pm2xxx_int;
 
diff --git a/drivers/power/pm2301_charger.h b/drivers/power/pm2301_charger.h
index fad1f387f8f4..8ce3cc0195df 100644
--- a/drivers/power/pm2301_charger.h
+++ b/drivers/power/pm2301_charger.h
@@ -9,27 +9,6 @@
 #ifndef PM2301_CHARGER_H
 #define PM2301_CHARGER_H
 
-#define MAIN_WDOG_ENA                   0x01
-#define MAIN_WDOG_KICK                  0x02
-#define MAIN_WDOG_DIS                   0x00
-#define CHARG_WD_KICK                   0x01
-#define MAIN_CH_ENA                     0x01
-#define MAIN_CH_NO_OVERSHOOT_ENA_N      0x02
-#define MAIN_CH_DET                     0x01
-#define MAIN_CH_CV_ON                   0x04
-#define OTP_ENABLE_WD                   0x01
-
-#define MAIN_CH_INPUT_CURR_SHIFT        4
-
-#define LED_INDICATOR_PWM_ENA           0x01
-#define LED_INDICATOR_PWM_DIS           0x00
-#define LED_IND_CUR_5MA                 0x04
-#define LED_INDICATOR_PWM_DUTY_252_256  0xBF
-
-/* HW failure constants */
-#define MAIN_CH_TH_PROT                 0x02
-#define MAIN_CH_NOK                     0x01
-
 /* Watchdog timeout constant */
 #define WD_TIMER                        0x30 /* 4min */
 #define WD_KICK_INTERVAL                (30 * HZ)
@@ -495,7 +474,6 @@ struct pm2xxx_charger {
         int failure_input_ovv;
         unsigned int lpn_pin;
         struct pm2xxx_interrupts *pm2_int;
-        struct ab8500_gpadc *gpadc;
         struct regulator *regu;
         struct pm2xxx_bm_data *bat;
         struct mutex lock;