On Mon, Jan 29, 2018 at 11:26:45AM +0000, Matt Redfearn wrote:
> When commit b27311e1cace ("MIPS: TXx9: Add RBTX4939 board support")
> added board support for the RBTX4939, it added a call to
> led_classdev_register even if the LED class is built as a module.
> Built-in arch code cannot call module code directly like this. Commit
> b33b44073734 ("MIPS: TXX9: use IS_ENABLED() macro") subsequently
> changed the inclusion of this code to a single check that
> CONFIG_LEDS_CLASS is either builtin or a module, but the same issue
> remains.
> This leads to MIPS allmodconfig builds failing when CONFIG_MACH_TX49XX=y
> is set:
>
> arch/mips/txx9/rbtx4939/setup.o: In function `rbtx4939_led_probe':
> setup.c:(.init.text+0xc0): undefined reference to `of_led_classdev_register'
> make: *** [Makefile:999: vmlinux] Error 1
>
> Fix this by using the IS_BUILTIN() macro instead.
>
> Fixes: b27311e1cace ("MIPS: TXx9: Add RBTX4939 board support")
> Fixes: b33b44073734 ("MIPS: TXX9: use IS_ENABLED() macro")
>
> Signed-off-by: Matt Redfearn <matt.redfearn@xxxxxxxx>
Thanks, applied
Cheers
James
>
> ---
>
> arch/mips/txx9/rbtx4939/setup.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c
> index 8b937300fb7f..fd26fadc8617 100644
> --- a/arch/mips/txx9/rbtx4939/setup.c
> +++ b/arch/mips/txx9/rbtx4939/setup.c
> @@ -186,7 +186,7 @@ static void __init rbtx4939_update_ioc_pen(void)
>
> #define RBTX4939_MAX_7SEGLEDS 8
>
> -#if IS_ENABLED(CONFIG_LEDS_CLASS)
> +#if IS_BUILTIN(CONFIG_LEDS_CLASS)
> static u8 led_val[RBTX4939_MAX_7SEGLEDS];
> struct rbtx4939_led_data {
> struct led_classdev cdev;
> @@ -261,7 +261,7 @@ static inline void rbtx4939_led_setup(void)
>
> static void __rbtx4939_7segled_putc(unsigned int pos, unsigned char val)
> {
> -#if IS_ENABLED(CONFIG_LEDS_CLASS)
> +#if IS_BUILTIN(CONFIG_LEDS_CLASS)
> unsigned long flags;
> local_irq_save(flags);
> /* bit7: reserved for LED class */
> --
> 2.7.4
>
Attachment:
signature.asc
Description: Digital signature
