Re: [PATCH 01/12] gpio: Only descend into gpio directory when CONFIG_GPIOLIB is set

Re: [PATCH 01/12] gpio: Only descend into gpio directory when CONFIG_GPIOLIB is set

[Linus Walleij]

On Mon, Jun 13, 2016 at 10:02 PM, Andrew F. Davis <afd@ti.com> wrote:

> When CONFIG_GPIOLIB is not set make will still descend into the gpio
> directory but nothing will be built. This produces unneeded build
> artifacts and messages in addition to slowing the build. Fix this here.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>

Patch applied. Strange that this went unnoticed for years.

Yours,
Linus Walleij

Re: [PATCH 12/12] leds: Only descend into leds directory when CONFIG_NEW_LEDS is set

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 3315 bytes --]

Hi,

[auto build test ERROR on gpio/for-next]
[also build test ERROR on v4.7-rc3 next-20160609]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Andrew-F-Davis/gpio-Only-descend-into-gpio-directory-when-CONFIG_GPIOLIB-is-set/20160614-061705
base:   https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git for-next
config: arm-s3c6400_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 5.3.1-8) 5.3.1 20160205
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   arch/arm/mach-s3c64xx/built-in.o: In function `crag6410_machine_init':
>> arch/arm/mach-s3c64xx/mach-crag6410.c:854: undefined reference to `gpio_led_register_device'

vim +854 arch/arm/mach-s3c64xx/mach-crag6410.c

e1a3c74f Mark Brown     2011-05-06  838  	s3c_sdhci2_set_platdata(&crag6410_hsmmc2_pdata);
e1a3c74f Mark Brown     2011-05-06  839  
e1a3c74f Mark Brown     2011-05-06  840  	s3c_i2c0_set_platdata(&i2c0_pdata);
8351c7aa Mark Brown     2011-12-02  841  	s3c_i2c1_set_platdata(&i2c1_pdata);
e1a3c74f Mark Brown     2011-05-06  842  	s3c_fb_set_platdata(&crag6410_lcd_pdata);
1f91b4cc Felipe Balbi   2015-08-06  843  	dwc2_hsotg_set_platdata(&crag6410_hsotg_pdata);
e1a3c74f Mark Brown     2011-05-06  844  
e1a3c74f Mark Brown     2011-05-06  845  	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
e1a3c74f Mark Brown     2011-05-06  846  	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
e1a3c74f Mark Brown     2011-05-06  847  
e1a3c74f Mark Brown     2011-05-06  848  	samsung_keypad_set_platdata(&crag6410_keypad_data);
479535ed Mark Brown     2012-10-17  849  	s3c64xx_spi0_set_platdata(NULL, 0, 2);
e1a3c74f Mark Brown     2011-05-06  850  
799fbf8c Thierry Reding 2015-10-13  851  	pwm_add_table(crag6410_pwm_lookup, ARRAY_SIZE(crag6410_pwm_lookup));
e1a3c74f Mark Brown     2011-05-06  852  	platform_add_devices(crag6410_devices, ARRAY_SIZE(crag6410_devices));
e1a3c74f Mark Brown     2011-05-06  853  
66211f98 Mark Brown     2011-12-29 @854  	gpio_led_register_device(-1, &gpio_leds_pdata);
66211f98 Mark Brown     2011-12-29  855  
ae24c263 Mark Brown     2011-06-22  856  	regulator_has_full_constraints();
ae24c263 Mark Brown     2011-06-22  857  
c656c306 Mark Brown     2011-12-08  858  	s3c64xx_pm_init();
e1a3c74f Mark Brown     2011-05-06  859  }
e1a3c74f Mark Brown     2011-05-06  860  
e1a3c74f Mark Brown     2011-05-06  861  MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")
e1a3c74f Mark Brown     2011-05-06  862  	/* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */

:::::: The code at line 854 was first introduced by commit
:::::: 66211f98d611056bf5fe918bbda37c636688574e ARM: S3C64XX: Support GPIO LEDs on Cragganmore

:::::: TO: Mark Brown <broonie@opensource.wolfsonmicro.com>
:::::: CC: Kukjin Kim <kgene.kim@samsung.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 16046 bytes --]

Re: [PATCH 12/12] leds: Only descend into leds directory when CONFIG_NEW_LEDS is set

[Jacek Anaszewski]

Hi Andrew,

Thanks for the patch.

Please address the issue [1] raised by test bot and resubmit.

Thanks,
Jacek Anaszewski

[1] https://lkml.org/lkml/2016/6/13/1091

On 06/13/2016 10:02 PM, Andrew F. Davis wrote:
> When CONFIG_NEW_LEDS is not set make will still descend into the leds
> directory but nothing will be built. This produces unneeded build
> artifacts and messages in addition to slowing the build. Fix this here.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
>   drivers/Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 567e32c..fa514d5 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -127,7 +127,7 @@ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
>   obj-$(CONFIG_CPU_IDLE)		+= cpuidle/
>   obj-$(CONFIG_MMC)		+= mmc/
>   obj-$(CONFIG_MEMSTICK)		+= memstick/
> -obj-y				+= leds/
> +obj-$(CONFIG_NEW_LEDS)		+= leds/
>   obj-$(CONFIG_INFINIBAND)	+= infiniband/
>   obj-$(CONFIG_SGI_SN)		+= sn/
>   obj-y				+= firmware/
>


-- 
Best regards,
Jacek Anaszewski

Re: [PATCH 12/12] leds: Only descend into leds directory when CONFIG_NEW_LEDS is set

[Andrew F. Davis]

On 06/15/2016 01:48 AM, Jacek Anaszewski wrote:
> Hi Andrew,
> 
> Thanks for the patch.
> 
> Please address the issue [1] raised by test bot and resubmit.
> 
> Thanks,
> Jacek Anaszewski
> 
> [1] https://lkml.org/lkml/2016/6/13/1091
> 

It looks like some systems use 'gpio_led_register_device' to make an
in-memory copy of their LED device table so the original can be removed
as .init.rodata. This doesn't necessarily depend on the LED subsystem
but it kind of seems useless when the rest of the subsystem is disabled.

One solution could be to use a dummy 'gpio_led_register_device' when the
subsystem is not enabled. Another is just to remove the five or so uses
of 'gpio_led_register_device' and have those systems register LED device
tables like other systems do.

If nether of these are acceptable then this patch can be dropped from
this series for now.

Thanks,
Andrew

> On 06/13/2016 10:02 PM, Andrew F. Davis wrote:
>> When CONFIG_NEW_LEDS is not set make will still descend into the leds
>> directory but nothing will be built. This produces unneeded build
>> artifacts and messages in addition to slowing the build. Fix this here.
>>
>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>> ---
>>   drivers/Makefile | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/Makefile b/drivers/Makefile
>> index 567e32c..fa514d5 100644
>> --- a/drivers/Makefile
>> +++ b/drivers/Makefile
>> @@ -127,7 +127,7 @@ obj-$(CONFIG_CPU_FREQ)        += cpufreq/
>>   obj-$(CONFIG_CPU_IDLE)        += cpuidle/
>>   obj-$(CONFIG_MMC)        += mmc/
>>   obj-$(CONFIG_MEMSTICK)        += memstick/
>> -obj-y                += leds/
>> +obj-$(CONFIG_NEW_LEDS)        += leds/
>>   obj-$(CONFIG_INFINIBAND)    += infiniband/
>>   obj-$(CONFIG_SGI_SN)        += sn/
>>   obj-y                += firmware/
>>
> 
> 

Re: [PATCH 12/12] leds: Only descend into leds directory when CONFIG_NEW_LEDS is set

[Jacek Anaszewski]

On 06/18/2016 12:46 AM, Andrew F. Davis wrote:
> On 06/15/2016 01:48 AM, Jacek Anaszewski wrote:
>> Hi Andrew,
>>
>> Thanks for the patch.
>>
>> Please address the issue [1] raised by test bot and resubmit.
>>
>> Thanks,
>> Jacek Anaszewski
>>
>> [1] https://lkml.org/lkml/2016/6/13/1091
>>
>
> It looks like some systems use 'gpio_led_register_device' to make an
> in-memory copy of their LED device table so the original can be removed
> as .init.rodata. This doesn't necessarily depend on the LED subsystem
> but it kind of seems useless when the rest of the subsystem is disabled.
>
> One solution could be to use a dummy 'gpio_led_register_device' when the
> subsystem is not enabled.

It sounds good. Please add a no-op version of gpio_led_register_device()
to include/leds.h, in a separate patch.

Thanks,
Jacek Anaszewski

> Another is just to remove the five or so uses
> of 'gpio_led_register_device' and have those systems register LED device
> tables like other systems do.
>
> If nether of these are acceptable then this patch can be dropped from
> this series for now.
>
> Thanks,
> Andrew
>
>> On 06/13/2016 10:02 PM, Andrew F. Davis wrote:
>>> When CONFIG_NEW_LEDS is not set make will still descend into the leds
>>> directory but nothing will be built. This produces unneeded build
>>> artifacts and messages in addition to slowing the build. Fix this here.
>>>
>>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>>> ---
>>>    drivers/Makefile | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/Makefile b/drivers/Makefile
>>> index 567e32c..fa514d5 100644
>>> --- a/drivers/Makefile
>>> +++ b/drivers/Makefile
>>> @@ -127,7 +127,7 @@ obj-$(CONFIG_CPU_FREQ)        += cpufreq/
>>>    obj-$(CONFIG_CPU_IDLE)        += cpuidle/
>>>    obj-$(CONFIG_MMC)        += mmc/
>>>    obj-$(CONFIG_MEMSTICK)        += memstick/
>>> -obj-y                += leds/
>>> +obj-$(CONFIG_NEW_LEDS)        += leds/
>>>    obj-$(CONFIG_INFINIBAND)    += infiniband/
>>>    obj-$(CONFIG_SGI_SN)        += sn/
>>>    obj-y                += firmware/
>>>
>>
>>
>
>

[PATCH] leds: Add no-op gpio_led_register_device when LED subsystem is disabled

[Andrew F. Davis]

Some systems use 'gpio_led_register_device' to make an in-memory copy of
their LED device table so the original can be removed as .init.rodata.
When the LED subsystem is not enabled source in the led directory is not
built and so this function may be undefined. Fix this here.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 include/linux/leds.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/linux/leds.h b/include/linux/leds.h
index d2b1306..a4a3da6 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -386,8 +386,16 @@ struct gpio_led_platform_data {
                                        unsigned long *delay_off);
 };

+#ifdef CONFIG_NEW_LEDS
 struct platform_device *gpio_led_register_device(
                int id, const struct gpio_led_platform_data *pdata);
+#else
+static inline struct platform_device *gpio_led_register_device(
+               int id, const struct gpio_led_platform_data *pdata)
+{
+       return 0;
+}
+#endif

 enum cpu_led_event {
        CPU_LED_IDLE_START,     /* CPU enters idle */
-- 
2.9.0

Re: [PATCH] leds: Add no-op gpio_led_register_device when LED subsystem is disabled

[Jacek Anaszewski]

Hi Andrew,

This patch doesn't apply, please rebase onto recent LED tree.

On 06/21/2016 12:13 AM, Andrew F. Davis wrote:
> Some systems use 'gpio_led_register_device' to make an in-memory copy of
> their LED device table so the original can be removed as .init.rodata.
> When the LED subsystem is not enabled source in the led directory is not
> built and so this function may be undefined. Fix this here.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
>   include/linux/leds.h | 8 ++++++++
>   1 file changed, 8 insertions(+)
>
> diff --git a/include/linux/leds.h b/include/linux/leds.h
> index d2b1306..a4a3da6 100644
> --- a/include/linux/leds.h
> +++ b/include/linux/leds.h
> @@ -386,8 +386,16 @@ struct gpio_led_platform_data {
>                                          unsigned long *delay_off);

Currently there is some stuff here, and in fact it has been for
a long time.

Patch "[PATCH 12/12] leds: Only descend into leds directory when
CONFIG_NEW_LEDS is set" also doesn't apply.
What repository are you using?

>   };
>
> +#ifdef CONFIG_NEW_LEDS
>   struct platform_device *gpio_led_register_device(
>                  int id, const struct gpio_led_platform_data *pdata);
> +#else
> +static inline struct platform_device *gpio_led_register_device(
> +               int id, const struct gpio_led_platform_data *pdata)
> +{
> +       return 0;
> +}
> +#endif
>
>   enum cpu_led_event {
>          CPU_LED_IDLE_START,     /* CPU enters idle */
>


-- 
Best regards,
Jacek Anaszewski

Re: [PATCH] leds: Add no-op gpio_led_register_device when LED subsystem is disabled

[Andrew F. Davis]

On 06/21/2016 02:09 AM, Jacek Anaszewski wrote:
> Hi Andrew,
> 
> This patch doesn't apply, please rebase onto recent LED tree.
> 
> On 06/21/2016 12:13 AM, Andrew F. Davis wrote:
>> Some systems use 'gpio_led_register_device' to make an in-memory copy of
>> their LED device table so the original can be removed as .init.rodata.
>> When the LED subsystem is not enabled source in the led directory is not
>> built and so this function may be undefined. Fix this here.
>>
>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>> ---
>>   include/linux/leds.h | 8 ++++++++
>>   1 file changed, 8 insertions(+)
>>
>> diff --git a/include/linux/leds.h b/include/linux/leds.h
>> index d2b1306..a4a3da6 100644
>> --- a/include/linux/leds.h
>> +++ b/include/linux/leds.h
>> @@ -386,8 +386,16 @@ struct gpio_led_platform_data {
>>                                          unsigned long *delay_off);
> 
> Currently there is some stuff here, and in fact it has been for
> a long time.
> 
> Patch "[PATCH 12/12] leds: Only descend into leds directory when
> CONFIG_NEW_LEDS is set" also doesn't apply.
> What repository are you using?
> 

v4.7-rc4, it may not apply due to the surrounding lines being changed in
the other patches which may not be applied to your tree. It is a single
line change per patch so hopefully the merge conflict resolutions will
be trivial.

A better solution could have been getting an ack from each maintainer
and having someone pull the whole series into one tree, but parts have
already been picked so it may be a little late for that.

>>   };
>>
>> +#ifdef CONFIG_NEW_LEDS
>>   struct platform_device *gpio_led_register_device(
>>                  int id, const struct gpio_led_platform_data *pdata);
>> +#else
>> +static inline struct platform_device *gpio_led_register_device(
>> +               int id, const struct gpio_led_platform_data *pdata)
>> +{
>> +       return 0;
>> +}
>> +#endif
>>
>>   enum cpu_led_event {
>>          CPU_LED_IDLE_START,     /* CPU enters idle */
>>
> 
> 

Re: [PATCH] leds: Add no-op gpio_led_register_device when LED subsystem is disabled

[Jacek Anaszewski]

On 06/21/2016 01:48 PM, Andrew F. Davis wrote:
> On 06/21/2016 02:09 AM, Jacek Anaszewski wrote:
>> Hi Andrew,
>>
>> This patch doesn't apply, please rebase onto recent LED tree.
>>
>> On 06/21/2016 12:13 AM, Andrew F. Davis wrote:
>>> Some systems use 'gpio_led_register_device' to make an in-memory copy of
>>> their LED device table so the original can be removed as .init.rodata.
>>> When the LED subsystem is not enabled source in the led directory is not
>>> built and so this function may be undefined. Fix this here.
>>>
>>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>>> ---
>>>    include/linux/leds.h | 8 ++++++++
>>>    1 file changed, 8 insertions(+)
>>>
>>> diff --git a/include/linux/leds.h b/include/linux/leds.h
>>> index d2b1306..a4a3da6 100644
>>> --- a/include/linux/leds.h
>>> +++ b/include/linux/leds.h
>>> @@ -386,8 +386,16 @@ struct gpio_led_platform_data {
>>>                                           unsigned long *delay_off);
>>
>> Currently there is some stuff here, and in fact it has been for
>> a long time.
>>
>> Patch "[PATCH 12/12] leds: Only descend into leds directory when
>> CONFIG_NEW_LEDS is set" also doesn't apply.
>> What repository are you using?
>>
>
> v4.7-rc4, it may not apply due to the surrounding lines being changed in
> the other patches which may not be applied to your tree. It is a single
> line change per patch so hopefully the merge conflict resolutions will
> be trivial.
>
> A better solution could have been getting an ack from each maintainer
> and having someone pull the whole series into one tree, but parts have
> already been picked so it may be a little late for that.

OK, I resolved the issues and applied, thanks.

>>>    };
>>>
>>> +#ifdef CONFIG_NEW_LEDS
>>>    struct platform_device *gpio_led_register_device(
>>>                   int id, const struct gpio_led_platform_data *pdata);
>>> +#else
>>> +static inline struct platform_device *gpio_led_register_device(
>>> +               int id, const struct gpio_led_platform_data *pdata)
>>> +{
>>> +       return 0;
>>> +}
>>> +#endif
>>>
>>>    enum cpu_led_event {
>>>           CPU_LED_IDLE_START,     /* CPU enters idle */
>>>
>>
>>
>
>


-- 
Best regards,
Jacek Anaszewski

Re: [PATCH 10/12] lguest: Only descend into lguest directory when CONFIG_LGUEST is set

[Rusty Russell]

"Andrew F. Davis" <afd@ti.com> writes:
> When CONFIG_LGUEST is not set make will still descend into the lguest
> directory but nothing will be built. This produces unneeded build
> artifacts and messages in addition to slowing the build. Fix this here.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
>  drivers/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied,

Thanks!
Rusty.

>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 19305e0..b178e2f 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -122,7 +122,7 @@ obj-$(CONFIG_ACCESSIBILITY)	+= accessibility/
>  obj-$(CONFIG_ISDN)		+= isdn/
>  obj-$(CONFIG_EDAC)		+= edac/
>  obj-$(CONFIG_EISA)		+= eisa/
> -obj-y				+= lguest/
> +obj-$(CONFIG_LGUEST)		+= lguest/
>  obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
>  obj-$(CONFIG_CPU_IDLE)		+= cpuidle/
>  obj-y				+= mmc/
> -- 
> 2.8.3