Re: [PATCH] mfd: mc13xxx: Move definitions out of structures

[Alexander Shiyan]

Wed, 19 Mar 2014 08:51:44 +0000 ÐÑ Lee Jones <lee.jones@xxxxxxxxxx>:
> On Tue, 18 Mar 2014, Bryan Wu wrote:
> 
> > On Tue, Mar 18, 2014 at 2:40 AM, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> > >> > > > > Signed-off-by: Alexander Shiyan <shc_work@xxxxxxx>
> > >> > > > > ---
> > >> > > > >  include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
> > >> > > > >  1 file changed, 12 insertions(+), 10 deletions(-)
> > >> > > > >
> > >> > > > > diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
> > >> > > > > index a326c85..d63b1d3 100644
> > >> > > > > --- a/include/linux/mfd/mc13xxx.h
> > >> > > > > +++ b/include/linux/mfd/mc13xxx.h
> > >> > > > > @@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
> > >> > > > >
> > >> > > > >  #define MAX_LED_CONTROL_REGS 6
> > >> > > > >
> > >> > > > > -struct mc13xxx_leds_platform_data {
> > >> > > > > -     struct mc13xxx_led_platform_data *led;
> > >> > > > > -     int num_leds;
> > >> > > > > -
> > >> > > > >  /* MC13783 LED Control 0 */
> > >> > > > >  #define MC13783_LED_C0_ENABLE                (1 << 0)
> > >> > > > >  #define MC13783_LED_C0_TRIODE_MD     (1 << 7)
> > >> > > > > @@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
> > >> > > > >  /* MC34708 LED Control 0 */
> > >> > > >
> > >> > > > I don't see the line above in the MFD tree?
> > >> > > >
> > >> > > > Which commit/branch/repo is this patch based on?
> > >> > >
> > >> > > Dependency:
> > >> > > linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)
> > >> > >
> > >> > > https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8
> > >> >
> > >> > Ah, you can't do that, as it will cause conflicts and Linus will
> > >> > likely get upset.
> > >>
> > >> So what do we do now? What is the solution?
> > >
> > > Don't worry about it. Bryan and I should be able to sort something out.
> > 
> > I lost the context here.
> > 
> > I merged Alexander's patch as a59ce6584d566847980f9dcad5343cd9856145c8
> > which modified the mc13xxx.h. But all things are related to LED driver
> > and only add several lines. Next time I will ask Lee to give an review
> > and ack.
> > 
> > So probably this patch has to wait for
> > a59ce6584d566847980f9dcad5343cd9856145c8 merged.
> 
> Yes, I think this is the best idea.
> 
> Alexander, can you re-send this patch with my Ack after the next merge
> window please?

Sure.

---