Re: linux-next: build failure after merge of the leds tree

Guido Günther
2020-01-06T15:52:16Z

Hi,
On Mon, Jan 06, 2020 at 11:32:33AM +0100, Pavel Machek wrote:
> Hi!
>
> > > After merging the leds tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/leds/leds-lm3692x.c: In function 'lm3692x_max_brightness':
> > > drivers/leds/leds-lm3692x.c:355:9: error: 'struct lm3692x_led' has no member named 'brightness_ctrl'
> > > 355 | if (led->brightness_ctrl & LM3692X_MAP_MODE_EXP) {
> > > | ^~
> >
> > That's a result of a patch from the mid of the series not being applied.
> > 'leds: lm3692x: Allow to configure brigthness mode' introduces that
> > struct member.
> >
> > > drivers/leds/leds-lm3692x.c: In function 'lm3692x_probe_dt':
> > > drivers/leds/leds-lm3692x.c:437:61: error: 'max_cur' undeclared (first use in this function)
> > > 437 | ret = fwnode_property_read_u32(child, "led-max-microamp", &max_cur);
> > > | ^~~~~~~
> >
> > That somehow got lost during merge of this commit:
> >
> > https://lore.kernel.org/linux-leds/5826b77d42521595e93d01d53475a8881cad1875.1578134779.git.agx@sigxcpu.org/T/#u
> >
> > Pavel, shall i send a patch to fix that up or should we rather try to
> > get the rest of the series in in the right order? Resetting linux-next
> > back to cffd61a5c7755546154539dcd7f36590e91e002f for the moment?
>
> I kept just three patches from the series, and pushed the result.
>
> Could I get the rest of the series, minus the "exponential" stuff, on
> top of that?
>
> Sorry for the confusion,

No problem, reshuffling stuff turned out to be simpler than expected:

https://lore.kernel.org/linux-leds/cover.1578324703.git.agx@sigxcpu.org/T/#mbbbaabea8ebaba1f864d8a4211d9bcac780261aa

If you don't want the exponential mode setting just omit 5/6 and
6/6.

Cheers,
-- Guido

>
> Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html