2 files changed, 10 insertions, 42 deletions

diff --git a/drivers/power/lp8788-charger.c b/drivers/power/lp8788-charger.c
index 1afa5f7a5359..fb592bfbec6e 100644
--- a/drivers/power/lp8788-charger.c
+++ b/drivers/power/lp8788-charger.c
@@ -584,50 +584,18 @@ static void lp8788_setup_adc_channel(const char *consumer_name,
                                 struct lp8788_charger *pchg)
 {
         struct lp8788_charger_platform_data *pdata = pchg->pdata;
-        struct device *dev = pchg->lp->dev;
         struct iio_channel *chan;
-        enum lp8788_adc_id id;
-        const char *chan_name[LPADC_MAX] = {
-                [LPADC_VBATT_5P5] = "vbatt-5p5",
-                [LPADC_VBATT_6P0] = "vbatt-6p0",
-                [LPADC_VBATT_5P0] = "vbatt-5p0",
-                [LPADC_ADC1]      = "adc1",
-                [LPADC_ADC2]      = "adc2",
-                [LPADC_ADC3]      = "adc3",
-                [LPADC_ADC4]      = "adc4",
-        };
 
         if (!pdata)
                 return;
 
-        id = pdata->vbatt_adc;
-        switch (id) {
-        case LPADC_VBATT_5P5:
-        case LPADC_VBATT_6P0:
-        case LPADC_VBATT_5P0:
-                chan = iio_channel_get(consumer_name, chan_name[id]);
-                pchg->chan[LP8788_VBATT] = IS_ERR(chan) ? NULL : chan;
-                break;
-        default:
-                dev_err(dev, "invalid ADC id for VBATT: %d\n", id);
-                pchg->chan[LP8788_VBATT] = NULL;
-                break;
-        }
+        /* ADC channel for battery voltage */
+        chan = iio_channel_get(consumer_name, pdata->adc_vbatt);
+        pchg->chan[LP8788_VBATT] = IS_ERR(chan) ? NULL : chan;
 
-        id = pdata->batt_temp_adc;
-        switch (id) {
-        case LPADC_ADC1:
-        case LPADC_ADC2:
-        case LPADC_ADC3:
-        case LPADC_ADC4:
-                chan = iio_channel_get(consumer_name, chan_name[id]);
-                pchg->chan[LP8788_BATT_TEMP] = IS_ERR(chan) ? NULL : chan;
-                break;
-        default:
-                dev_err(dev, "invalid ADC id for BATT_TEMP : %d\n", id);
-                pchg->chan[LP8788_BATT_TEMP] = NULL;
-                break;
-        }
+        /* ADC channel for battery temperature */
+        chan = iio_channel_get(consumer_name, pdata->adc_batt_temp);
+        pchg->chan[LP8788_BATT_TEMP] = IS_ERR(chan) ? NULL : chan;
 }
 
 static void lp8788_release_adc_channel(struct lp8788_charger *pchg)
diff --git a/include/linux/mfd/lp8788.h b/include/linux/mfd/lp8788.h
index cec364bdccfa..2a32b16f79cb 100644
--- a/include/linux/mfd/lp8788.h
+++ b/include/linux/mfd/lp8788.h
@@ -211,16 +211,16 @@ struct lp8788_chg_param {
 
 /*
  * struct lp8788_charger_platform_data
- * @vbatt_adc         : adc selection id for battery voltage
- * @batt_temp_adc     : adc selection id for battery temperature
+ * @adc_vbatt         : adc channel name for battery voltage
+ * @adc_batt_temp     : adc channel name for battery temperature
  * @max_vbatt_mv      : used for calculating battery capacity
  * @chg_params        : initial charging parameters
  * @num_chg_params    : numbers of charging parameters
  * @charger_event     : the charger event can be reported to the platform side
  */
 struct lp8788_charger_platform_data {
-        enum lp8788_adc_id vbatt_adc;
-        enum lp8788_adc_id batt_temp_adc;
+        const char *adc_vbatt;
+        const char *adc_batt_temp;
         unsigned int max_vbatt_mv;
         struct lp8788_chg_param *chg_params;
         int num_chg_params;