diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-08-22 20:31:33 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-09-20 15:33:12 -0700 |
| commit | f1ade35253f5026170a5fe17f87d0249f03629dd (patch) | |
| tree | 4d4ba3a37a02df7598cc646c30740f15df28edb9 /drivers/mfd/88pm860x-core.c | |
| parent | a830d28b48bf92944e57058e87d17cee5a7cd2a1 (diff) | |
| download | kernel-common-f1ade35253f5026170a5fe17f87d0249f03629dd.tar.gz kernel-common-f1ade35253f5026170a5fe17f87d0249f03629dd.tar.bz2 kernel-common-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/mfd/88pm860x-core.c')
| -rw-r--r-- | drivers/mfd/88pm860x-core.c | 4 |
1 files changed, 2 insertions, 2 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[] = { |