2017-08-23 13:29:21

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] ARM: OMAP2+: fix missing variable declaration

The function that was added doesn't actually build:

arch/arm/mach-omap2/display.c: In function 'omapdss_init_fbdev':
arch/arm/mach-omap2/display.c:184:2: error: 'r' undeclared (first use in this function)

This adds a declaration for 'r' to fix it.

Fixes: 5ce783025c82 ("ARM: OMAP2+: Don't register omapdss device for omapdrm")
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm/mach-omap2/display.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 798fc718fffe..b3f6eb5d04a2 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -172,6 +172,7 @@ static int __init omapdss_init_fbdev(void)
.set_min_bus_tput = omap_dss_set_min_bus_tput,
};
struct device_node *node;
+ int r;

board_data.version = omap_display_get_version();
if (board_data.version == OMAPDSS_VER_UNKNOWN) {
--
2.9.0


2017-08-23 13:53:21

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] ARM: OMAP2+: fix missing variable declaration

Hi Arnd,

On Wednesday, 23 August 2017 16:28:19 EEST Arnd Bergmann wrote:
> The function that was added doesn't actually build:
>
> arch/arm/mach-omap2/display.c: In function 'omapdss_init_fbdev':
> arch/arm/mach-omap2/display.c:184:2: error: 'r' undeclared (first use in
> this function)
>
> This adds a declaration for 'r' to fix it.
>
> Fixes: 5ce783025c82 ("ARM: OMAP2+: Don't register omapdss device for
> omapdrm")
> Signed-off-by: Arnd Bergmann <[email protected]>

Looks like I haven't tested the patch with CONFIG_FB_OMAP2 enabled after the
last rebase. I'm very sorry about that :-(

Reviewed-by: Laurent Pinchart <[email protected]>

Tomi, I assume you will pick this up and sent it to Dave for v4.14-rc1.

> ---
> arch/arm/mach-omap2/display.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
> index 798fc718fffe..b3f6eb5d04a2 100644
> --- a/arch/arm/mach-omap2/display.c
> +++ b/arch/arm/mach-omap2/display.c
> @@ -172,6 +172,7 @@ static int __init omapdss_init_fbdev(void)
> .set_min_bus_tput = omap_dss_set_min_bus_tput,
> };
> struct device_node *node;
> + int r;
>
> board_data.version = omap_display_get_version();
> if (board_data.version == OMAPDSS_VER_UNKNOWN) {


--
Regards,

Laurent Pinchart

2017-08-23 14:53:34

by Tony Lindgren

[permalink] [raw]
Subject: Re: [PATCH] ARM: OMAP2+: fix missing variable declaration

* Laurent Pinchart <[email protected]> [170823 06:53]:
> Hi Arnd,
>
> On Wednesday, 23 August 2017 16:28:19 EEST Arnd Bergmann wrote:
> > The function that was added doesn't actually build:
> >
> > arch/arm/mach-omap2/display.c: In function 'omapdss_init_fbdev':
> > arch/arm/mach-omap2/display.c:184:2: error: 'r' undeclared (first use in
> > this function)
> >
> > This adds a declaration for 'r' to fix it.
> >
> > Fixes: 5ce783025c82 ("ARM: OMAP2+: Don't register omapdss device for
> > omapdrm")
> > Signed-off-by: Arnd Bergmann <[email protected]>
>
> Looks like I haven't tested the patch with CONFIG_FB_OMAP2 enabled after the
> last rebase. I'm very sorry about that :-(
>
> Reviewed-by: Laurent Pinchart <[email protected]>
>
> Tomi, I assume you will pick this up and sent it to Dave for v4.14-rc1.

Acked-by: Tony Lindgren <[email protected]>

2017-08-24 12:19:19

by Tomi Valkeinen

[permalink] [raw]
Subject: Re: [PATCH] ARM: OMAP2+: fix missing variable declaration



Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

On 23/08/17 16:53, Laurent Pinchart wrote:
> Hi Arnd,
>
> On Wednesday, 23 August 2017 16:28:19 EEST Arnd Bergmann wrote:
>> The function that was added doesn't actually build:
>>
>> arch/arm/mach-omap2/display.c: In function 'omapdss_init_fbdev':
>> arch/arm/mach-omap2/display.c:184:2: error: 'r' undeclared (first use in
>> this function)
>>
>> This adds a declaration for 'r' to fix it.
>>
>> Fixes: 5ce783025c82 ("ARM: OMAP2+: Don't register omapdss device for
>> omapdrm")
>> Signed-off-by: Arnd Bergmann <[email protected]>
>
> Looks like I haven't tested the patch with CONFIG_FB_OMAP2 enabled after the
> last rebase. I'm very sorry about that :-(
>
> Reviewed-by: Laurent Pinchart <[email protected]>
>
> Tomi, I assume you will pick this up and sent it to Dave for v4.14-rc1.

Yep, I'll pick it up. I could swear I tested omapfb build, but...
Obviously not.

Tomi