| Message ID | 20120823034815.GB16674@lizard (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 22, 2012 at 08:48:15PM -0700, Anton Vorontsov wrote: [....] > 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] * > > They are minor, except for the last one. You seemed to use > 'regulator_bulk_data' struct (just as charger manager documentation > wrongly tells you, yup), 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. :-) Oh, actually, I see that this is a result of extcon rework, so not your fault at all. Anton.
Hi Anton
Thanks for helping me to amend these patch.
I got many good suggestions and learn a lot in this process:)
BTW, you mean you will help to amend that several minor warning with
battery tree?
If there is something wrong, I can correct it.
Thanks
2012/8/23 Anton Vorontsov <anton.vorontsov@linaro.org>
> On Wed, Aug 22, 2012 at 08:48:15PM -0700, Anton Vorontsov wrote:
> [....]
> > 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] *
> >
> > They are minor, except for the last one. You seemed to use
> > 'regulator_bulk_data' struct (just as charger manager documentation
> > wrongly tells you, yup), 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. :-)
>
> Oh, actually, I see that this is a result of extcon rework, so not
> your fault at all.
>
> Anton.
>
On Thu, Aug 23, 2012 at 05:06:22PM +0800, jett zhou wrote: > Thanks for helping me to amend these patch. I got many good > suggestions and learn a lot in this process:) BTW, you mean you will > help to amend that several minor warning with battery tree? Yup, I have these small fixups locally in my tree already, so if/once Samuel gives me an Ack for the mfd part, I'll merge it into battery git tree. Thanks, Anton.
Got it. Thanks 2012/8/23 Anton Vorontsov <anton.vorontsov@linaro.org> > On Thu, Aug 23, 2012 at 05:06:22PM +0800, jett zhou wrote: > > Thanks for helping me to amend these patch. I got many good > > suggestions and learn a lot in this process:) BTW, you mean you will > > help to amend that several minor warning with battery tree? > > Yup, I have these small fixups locally in my tree already, so if/once > Samuel gives me an Ack for the mfd part, I'll merge it into battery git > tree. > > Thanks, > > Anton. >
On Thu, Aug 23, 2012 at 8:22 PM, Anton Vorontsov <anton.vorontsov@linaro.org> wrote: > On Thu, Aug 23, 2012 at 05:06:22PM +0800, jett zhou wrote: >> Thanks for helping me to amend these patch. I got many good >> suggestions and learn a lot in this process:) BTW, you mean you will >> help to amend that several minor warning with battery tree? > > Yup, I have these small fixups locally in my tree already, so if/once > Samuel gives me an Ack for the mfd part, I'll merge it into battery git > tree. > > Thanks, > > Anton. Hi all, Any updates? Regards Haojian
On Thu, Sep 13, 2012 at 03:48:11PM +0800, Haojian Zhuang wrote: > On Thu, Aug 23, 2012 at 8:22 PM, Anton Vorontsov > <anton.vorontsov@linaro.org> wrote: > > On Thu, Aug 23, 2012 at 05:06:22PM +0800, jett zhou wrote: > >> Thanks for helping me to amend these patch. I got many good > >> suggestions and learn a lot in this process:) BTW, you mean you will > >> help to amend that several minor warning with battery tree? > > > > Yup, I have these small fixups locally in my tree already, so if/once > > Samuel gives me an Ack for the mfd part, I'll merge it into battery git > > tree. > > Any updates? OK, I guess I can just go ahead and apply it, the MFD changes are very trivial anyway. So, this is now applied (along with some fixups that I was talking about in my previous reply). Thank you! Anton.
On Fri, Sep 21, 2012 at 6:35 AM, Anton Vorontsov <anton.vorontsov@linaro.org> wrote: > On Thu, Sep 13, 2012 at 03:48:11PM +0800, Haojian Zhuang wrote: >> On Thu, Aug 23, 2012 at 8:22 PM, Anton Vorontsov >> <anton.vorontsov@linaro.org> wrote: >> > On Thu, Aug 23, 2012 at 05:06:22PM +0800, jett zhou wrote: >> >> Thanks for helping me to amend these patch. I got many good >> >> suggestions and learn a lot in this process:) BTW, you mean you will >> >> help to amend that several minor warning with battery tree? >> > >> > Yup, I have these small fixups locally in my tree already, so if/once >> > Samuel gives me an Ack for the mfd part, I'll merge it into battery git >> > tree. >> >> Any updates? > > OK, I guess I can just go ahead and apply it, the MFD changes are very > trivial anyway. So, this is now applied (along with some fixups that > I was talking about in my previous reply). > > Thank you! > > Anton. Thanks Haojian
Hi Anton, On Thu, Sep 20, 2012 at 03:35:05PM -0700, Anton Vorontsov wrote: > On Thu, Sep 13, 2012 at 03:48:11PM +0800, Haojian Zhuang wrote: > > On Thu, Aug 23, 2012 at 8:22 PM, Anton Vorontsov > > <anton.vorontsov@linaro.org> wrote: > > > On Thu, Aug 23, 2012 at 05:06:22PM +0800, jett zhou wrote: > > >> Thanks for helping me to amend these patch. I got many good > > >> suggestions and learn a lot in this process:) BTW, you mean you will > > >> help to amend that several minor warning with battery tree? > > > > > > Yup, I have these small fixups locally in my tree already, so if/once > > > Samuel gives me an Ack for the mfd part, I'll merge it into battery git > > > tree. > > > > Any updates? > > OK, I guess I can just go ahead and apply it, the MFD changes are very > trivial anyway. So, this is now applied (along with some fixups that > I was talking about in my previous reply). Applying this patch as is will not build as the mfd_add_devices() API has changed. Either you rebase your patchset on top of Linus tree or I take this patch and fix the mfd_add_devices() call. Please let me know how you want to proceed. Cheers, Samuel.
On Sat, Sep 22, 2012 at 12:14:22AM +0200, Samuel Ortiz wrote: > > > >> Thanks for helping me to amend these patch. I got many good > > > >> suggestions and learn a lot in this process:) BTW, you mean you will > > > >> help to amend that several minor warning with battery tree? > > > > > > > > Yup, I have these small fixups locally in my tree already, so if/once > > > > Samuel gives me an Ack for the mfd part, I'll merge it into battery git > > > > tree. > > > > > > Any updates? > > > > OK, I guess I can just go ahead and apply it, the MFD changes are very > > trivial anyway. So, this is now applied (along with some fixups that > > I was talking about in my previous reply). > Applying this patch as is will not build as the mfd_add_devices() API has > changed. Either you rebase your patchset on top of Linus tree or I take this > patch and fix the mfd_add_devices() call. Please let me know how you want to > proceed. It's not the first time this happens, and git let us fix it in a pretty elegant way: what I'm usually doing is just pulling Linus' tree back into my tree (but not rebasing), and in the merge commit I fixup the issue. That way things are still bisectable, and everything should work before and after mfd_add_devices() change. So, it's all OK, I'll just merge Linus' -rc6 back into my tree (and Stephen already has a fix in linux-next). Thanks! Anton.
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 229cb29..76b5b7d 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 e84e98d..1c19828 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 52b59d8..4eeef9b 100644 --- a/drivers/power/88pm860x_charger.c +++ b/drivers/power/88pm860x_charger.c @@ -634,7 +634,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[] = {