summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-08-23 05:31:33 +0200
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-09-21 00:33:12 +0200
commitf1ade35253f5026170a5fe17f87d0249f03629dd (patch)
tree4d4ba3a37a02df7598cc646c30740f15df28edb9 /drivers
parentpower_supply: Enable battery-charger for 88pm860x (diff)
downloadlinux-f1ade35253f5026170a5fe17f87d0249f03629dd.tar.xz
linux-f1ade35253f5026170a5fe17f87d0249f03629dd.zip
88pm860x_battery and charger: Fix a few post-merge issues
Sparse complains: CHECK drivers/power/88pm860x_battery.c drivers/power/88pm860x_battery.c:128:5: warning: symbol 'array_soc' was not declared. Should it be static? CHECK drivers/power/88pm860x_charger.c drivers/power/88pm860x_charger.c:640:3: warning: symbol 'pm860x_irq_descs' was not declared. Should it be static? CHECK drivers/mfd/88pm860x-core.c drivers/mfd/88pm860x-core.c:803:53: warning: incorrect type in assignment (different base types) drivers/mfd/88pm860x-core.c:803:53: expected struct charger_regulator *charger_regulators drivers/mfd/88pm860x-core.c:803:53: got struct regulator_bulk_data static [toplevel] * The issues are minor, except for the last one. We seemed to use 'regulator_bulk_data' struct (just as charger manager documentation wrongly tells us), but in real it should have been 'struct charger_regulator'. The only reason that it worked is because both 'supply' and 'regulator_name' struct members are the first in these structs. :-) Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/88pm860x-core.c4
-rw-r--r--drivers/power/88pm860x_battery.c2
-rw-r--r--drivers/power/88pm860x_charger.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 229cb2920089..76b5b7daf65d 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -157,8 +157,8 @@ static struct regulator_init_data preg_init_data = {
.consumer_supplies = &preg_supply[0],
};
-static struct regulator_bulk_data chg_desc_regulator_data[] = {
- { .supply = "preg", },
+static struct charger_regulator chg_desc_regulator_data[] = {
+ { .regulator_name = "preg", },
};
static struct mfd_cell power_devs[] = {
diff --git a/drivers/power/88pm860x_battery.c b/drivers/power/88pm860x_battery.c
index 5e905f3db4bf..beed5ecf75e1 100644
--- a/drivers/power/88pm860x_battery.c
+++ b/drivers/power/88pm860x_battery.c
@@ -125,7 +125,7 @@ struct ccnt {
* State of Charge.
* The first number is mAh(=3.6C), and the second number is percent point.
*/
-int array_soc[][2] = {
+static int array_soc[][2] = {
{4170, 100}, {4154, 99}, {4136, 98}, {4122, 97}, {4107, 96},
{4102, 95}, {4088, 94}, {4081, 93}, {4070, 92}, {4060, 91},
{4053, 90}, {4044, 89}, {4035, 88}, {4028, 87}, {4019, 86},
diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index 4fd7614ee839..2dbeb1460901 100644
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -632,7 +632,7 @@ static int pm860x_init_charger(struct pm860x_charger_info *info)
return 0;
}
-struct pm860x_irq_desc {
+static struct pm860x_irq_desc {
const char *name;
irqreturn_t (*handler)(int irq, void *data);
} pm860x_irq_descs[] = {