battery: fix build warnings

Fix build warnings in product battery driver.

Change-Id: I532f2ee3d8401823f0d5e4c029c4c73c3d83793b
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/battery/sec_adc.c b/drivers/battery/sec_adc.c
index c9f845f..d389b50 100755 (executable)
--- a/drivers/battery/sec_adc.c
+++ b/drivers/battery/sec_adc.c
@@ -14,21 +14,23 @@
 #include <soc/sprd/adc.h>
 
 #define ADC_CHANNEL_TEMP        1
+#define TEMP_ADC               0
 
+#if TEMP_ADC
 static struct iio_channel *temp_adc;
+#endif
 
 static void sec_bat_adc_ap_init(struct platform_device *pdev)
 {
-       /*
+#if TEMP_ADC
        temp_adc = iio_channel_get_all(&pdev->dev);
-       */
-       return true;
+#endif
+       return;
 }
 
 static int sec_bat_adc_ap_read(int channel)
 {
        int data;
-       int ret = 0;
 
        data = sci_adc_get_value(ADC_CHANNEL_TEMP, false);
        pr_info("read channel [%d]\n", data);
@@ -62,10 +64,10 @@ static int sec_bat_adc_ap_read(int channel)
 
 static void sec_bat_adc_ap_exit(void)
 {
-       /*
+#if TEMP_ADC
        iio_channel_release(temp_adc);
-       */
-        return true;
+#endif
+        return;
 }
 
 static void sec_bat_adc_none_init(struct platform_device *pdev)

diff --git a/drivers/battery/sec_dt_init.c b/drivers/battery/sec_dt_init.c
index d0747a4..52ba135 100644 (file)
--- a/drivers/battery/sec_dt_init.c
+++ b/drivers/battery/sec_dt_init.c
@@ -236,6 +236,11 @@ void sec_bat_initial_check(void)
        }
 }
 
+static void _sec_bat_initial_check(struct sec_battery_info *battery)
+{
+       sec_bat_initial_check();
+}
+
 static bool sec_bat_gpio_init(void)
 {
        return true;
@@ -318,7 +323,7 @@ void sec_charger_cb(u8 cable_type)
        }
 
 skip:
-       return 0;
+       return;
 }
 #endif
 
@@ -463,7 +468,7 @@ void sec_charger_cb(u8 cable_type)
        }
 
 skip:
-       return 0;
+       return;
 
 }
 #endif /* CONFIG_MFD_SM5504 */
@@ -918,7 +923,7 @@ int sec_bat_dt_init(struct device_node *np,
        pdata->check_cable_result_callback =
                sec_bat_check_cable_result_callback;
        pdata->get_temperature_callback = sec_bat_get_temperature_callback;
-       pdata->initial_check = sec_bat_initial_check;
+       pdata->initial_check = _sec_bat_initial_check;
        pdata->is_lpm = sec_bat_is_lpm;
        pdata->ovp_uvlo_callback = sec_bat_ovp_uvlo_callback;
        pdata->ovp_uvlo_result_callback = sec_bat_ovp_uvlo_result_callback;
@@ -1111,7 +1116,7 @@ int sec_fg_dt_init(struct device_node *np,
                battery_data = devm_kzalloc(dev, sizeof(*battery_data), GFP_KERNEL);
                temp_np = of_get_child_by_name(np, "sprd_fgu");
                if (!temp_np) {
-                       return ERR_PTR(-EINVAL);
+                       return -EINVAL;
                }
                battery_data->gpio_vchg_detect = (uint32_t) of_get_named_gpio(np, "gpios", 0);
                battery_data->irq_fgu = irq_of_parse_and_map(temp_np, 0);

diff --git a/drivers/battery/sec_fuelgauge.c b/drivers/battery/sec_fuelgauge.c
index 30c5d32..6604062 100755 (executable)
--- a/drivers/battery/sec_fuelgauge.c
+++ b/drivers/battery/sec_fuelgauge.c
@@ -256,6 +256,7 @@ static int sec_fg_set_property(struct power_supply *psy,
        return 0;
 }
 
+#ifndef CONFIG_FUELGAUGE_SPRD4SAMSUNG27X3
 static void sec_fg_isr_work(struct work_struct *work)
 {
        struct sec_fuelgauge_info *fuelgauge =
@@ -303,6 +304,7 @@ static irqreturn_t sec_fg_irq_thread(int irq, void *irq_data)
 
        return IRQ_HANDLED;
 }
+#endif
 
 static int sec_fg_create_attrs(struct device *dev)
 {
@@ -502,7 +504,9 @@ err_irq:
                free_irq(fuelgauge->pdata->fg_irq, fuelgauge);
        if (fuelalert_init_ret)
        wake_lock_destroy(&fuelgauge->fuel_alert_wake_lock);
+#ifndef CONFIG_FUELGAUGE_SPRD4SAMSUNG27X3
 err_supply_unreg:
+#endif
        power_supply_unregister(&fuelgauge->psy_fg);
 err_free:
        mutex_destroy(&fuelgauge->fg_lock);
@@ -696,7 +700,9 @@ static int sec_fuelgauge_probe(struct i2c_client *client,
 err_irq:
        if (fuelgauge->pdata->fg_irq)
                free_irq(fuelgauge->pdata->fg_irq, fuelgauge);
+#if 0
 err_supply_unreg:
+#endif
        power_supply_unregister(&fuelgauge->psy_fg);
 err_free:
        mutex_destroy(&fuelgauge->fg_lock);

diff --git a/drivers/battery/sm5701_charger.c b/drivers/battery/sm5701_charger.c
index 164a572..84314b2 100644 (file)
--- a/drivers/battery/sm5701_charger.c
+++ b/drivers/battery/sm5701_charger.c
@@ -41,7 +41,7 @@
 extern int sec_chg_dt_init(struct device_node *np,
                         struct device *dev,
                         sec_battery_platform_data_t *pdata);
-extern led_state_charger;
+extern int led_state_charger;
 
 static enum power_supply_property sec_charger_props[] = {
         POWER_SUPPLY_PROP_STATUS,
@@ -303,10 +303,10 @@ static void SM5701_isr_work(struct work_struct *work)
 {
        union power_supply_propval val, value;
        struct SM5701_charger_data *charger =
-               container_of(work, struct SM5701_charger_data, isr_work.work);;
+               container_of(work, struct SM5701_charger_data, isr_work.work);
        int full_check_type;
 
-       u8 cln = 0, topoff_data = 0, status = 0;
+       u8 topoff_data = 0, status = 0;
 
        psy_do_property("battery", get,
                POWER_SUPPLY_PROP_CHARGE_NOW, val);
@@ -417,7 +417,7 @@ static void SM5701_charger_initialize(struct SM5701_charger_data *charger)
        u8 reg_data = 0, status1 = 0;
 
        SM5701_reg_read(charger->SM5701->i2c,
-                       SM5701_DEVICE_ID, &charger->dev_id);
+                       SM5701_DEVICE_ID, (u8 *)&charger->dev_id);
        pr_info("%s: SM5701 Charger init, CHIP REV : %2d !! \n",
                        __func__, charger->dev_id);
        charger->is_fullcharged = false;
@@ -527,7 +527,6 @@ static int sec_chg_set_property(struct power_supply *psy,
 //     int set_charging_current, set_charging_current_max;
 //     const int usb_charging_current = charger->pdata->charging_current[
 //             POWER_SUPPLY_TYPE_USB].fast_charging_current;
-       u8 topoff_data = 0, stauts = 0;
 
        switch (psp) {
        case POWER_SUPPLY_PROP_STATUS:
@@ -710,7 +709,7 @@ static int SM5701_charger_probe(struct platform_device *pdev)
                if (ret < 0)
                        goto err_parse_dt;
        } else
-               charger->pdata = pdata->charger_data;
+               charger->pdata = (void *)pdata->charger_data;
 
        charger->voltage_max = charger->pdata->chg_float_voltage;