clocksource: sh_mtu2: Add index to struct sh_mtu2_channel

[cascardo/linux.git] / drivers / power / pm2301_charger.c

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index ffa10ed..62c15af 100644 (file)
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -205,7 +205,7 @@ static int pm2xxx_charger_batt_therm_mngt(struct pm2xxx_charger *pm2, int val)
 }
 
 
-int pm2xxx_charger_die_therm_mngt(struct pm2xxx_charger *pm2, int val)
+static int pm2xxx_charger_die_therm_mngt(struct pm2xxx_charger *pm2, int val)
 {
        queue_work(pm2->charger_wq, &pm2->check_main_thermal_prot_work);
 
@@ -722,8 +722,12 @@ static int pm2xxx_charger_ac_en(struct ux500_charger *charger,
 
                dev_dbg(pm2->dev, "Enable AC: %dmV %dmA\n", vset, iset);
                if (!pm2->vddadc_en_ac) {
-                       regulator_enable(pm2->regu);
-                       pm2->vddadc_en_ac = true;
+                       ret = regulator_enable(pm2->regu);
+                       if (ret)
+                               dev_warn(pm2->dev,
+                                       "Failed to enable vddadc regulator\n");
+                       else
+                               pm2->vddadc_en_ac = true;
                }
 
                ret = pm2xxx_charging_init(pm2);
@@ -953,37 +957,24 @@ static int  pm2xxx_runtime_suspend(struct device *dev)
 {
        struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
        struct pm2xxx_charger *pm2;
-       int ret = 0;
 
        pm2 = (struct pm2xxx_charger *)i2c_get_clientdata(pm2xxx_i2c_client);
-       if (!pm2) {
-               dev_err(pm2->dev, "no pm2xxx_charger data supplied\n");
-               ret = -EINVAL;
-               return ret;
-       }
-
        clear_lpn_pin(pm2);
 
-       return ret;
+       return 0;
 }
 
 static int  pm2xxx_runtime_resume(struct device *dev)
 {
        struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
        struct pm2xxx_charger *pm2;
-       int ret = 0;
 
        pm2 = (struct pm2xxx_charger *)i2c_get_clientdata(pm2xxx_i2c_client);
-       if (!pm2) {
-               dev_err(pm2->dev, "no pm2xxx_charger data supplied\n");
-               ret = -EINVAL;
-               return ret;
-       }
 
        if (gpio_is_valid(pm2->lpn_pin) && gpio_get_value(pm2->lpn_pin) == 0)
                set_lpn_pin(pm2);
 
-       return ret;
+       return 0;
 }
 
 #endif