The variable has become unused in modular configurations
which triggers a harmless warning:
drivers/video/fbdev/matrox/matroxfb_base.c:1583:12: error: 'hotplug' defined but not used [-Werror=unused-variable]
This moves it into an #ifdef section of the file, matching
all its references.
Fixes: 376b3ff54c9a ("fbdev: Nuke FBINFO_MODULE")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index fd1589fcdf15..00ea4e4ab95a 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -1578,9 +1578,9 @@ static struct fb_videomode defaultmode = {
NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
0, FB_VMODE_NONINTERLACED
};
-#endif /* !MODULE */
static int hotplug = 0;
+#endif /* !MODULE */
static void setDefaultOutputs(struct matrox_fb_info *minfo)
{
--
2.9.0
On Wed, Aug 02, 2017 at 11:36:47AM +0200, Arnd Bergmann wrote:
> The variable has become unused in modular configurations
> which triggers a harmless warning:
>
> drivers/video/fbdev/matrox/matroxfb_base.c:1583:12: error: 'hotplug' defined but not used [-Werror=unused-variable]
>
> This moves it into an #ifdef section of the file, matching
> all its references.
>
> Fixes: 376b3ff54c9a ("fbdev: Nuke FBINFO_MODULE")
> Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]>
> ---
> drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
> index fd1589fcdf15..00ea4e4ab95a 100644
> --- a/drivers/video/fbdev/matrox/matroxfb_base.c
> +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
> @@ -1578,9 +1578,9 @@ static struct fb_videomode defaultmode = {
> NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
> 0, FB_VMODE_NONINTERLACED
> };
> -#endif /* !MODULE */
>
> static int hotplug = 0;
> +#endif /* !MODULE */
>
> static void setDefaultOutputs(struct matrox_fb_info *minfo)
> {
> --
> 2.9.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Hi Arnd,
With is change we can get below error. If MODULE is define.
drivers/video/fbdev/matrox/matroxfb_base.c: In function ?initMatrox2?:
drivers/video/fbdev/matrox/matroxfb_base.c:1799:23: error: ?hotplug?
undeclared (first use in this function)
minfo->fbcon.flags = hotplug ? FBINFO_FLAG_MODULE : FBINFO_FLAG_DEFAULT;
Please check this.
~arvind
On Wednesday 02 August 2017 03:31 PM, Daniel Vetter wrote:
> On Wed, Aug 02, 2017 at 11:36:47AM +0200, Arnd Bergmann wrote:
>> The variable has become unused in modular configurations
>> which triggers a harmless warning:
>>
>> drivers/video/fbdev/matrox/matroxfb_base.c:1583:12: error: 'hotplug' defined but not used [-Werror=unused-variable]
>>
>> This moves it into an #ifdef section of the file, matching
>> all its references.
>>
>> Fixes: 376b3ff54c9a ("fbdev: Nuke FBINFO_MODULE")
>> Signed-off-by: Arnd Bergmann <[email protected]>
> Reviewed-by: Daniel Vetter <[email protected]>
>
>> ---
>> drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
>> index fd1589fcdf15..00ea4e4ab95a 100644
>> --- a/drivers/video/fbdev/matrox/matroxfb_base.c
>> +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
>> @@ -1578,9 +1578,9 @@ static struct fb_videomode defaultmode = {
>> NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
>> 0, FB_VMODE_NONINTERLACED
>> };
>> -#endif /* !MODULE */
>>
>> static int hotplug = 0;
>> +#endif /* !MODULE */
>>
>> static void setDefaultOutputs(struct matrox_fb_info *minfo)
>> {
>> --
>> 2.9.0
>>
On Wed, Aug 2, 2017 at 1:14 PM, Arvind Yadav <[email protected]> wrote:
> Hi Arnd,
>
> With is change we can get below error. If MODULE is define.
>
> drivers/video/fbdev/matrox/matroxfb_base.c: In function ‘initMatrox2’:
> drivers/video/fbdev/matrox/matroxfb_base.c:1799:23: error: ‘hotplug’
> undeclared (first use in this function)
> minfo->fbcon.flags = hotplug ? FBINFO_FLAG_MODULE : FBINFO_FLAG_DEFAULT;
>
> Please check this.
I think you are looking at an older tree, the patch only applies to today's
fbdev/fbdev-for-next branch, containing commit 376b3ff54c9a ("fbdev: Nuke
FBINFO_MODULE"), which was applied last night.
Arnd
On Wednesday, August 02, 2017 11:36:47 AM Arnd Bergmann wrote:
> The variable has become unused in modular configurations
> which triggers a harmless warning:
>
> drivers/video/fbdev/matrox/matroxfb_base.c:1583:12: error: 'hotplug' defined but not used [-Werror=unused-variable]
>
> This moves it into an #ifdef section of the file, matching
> all its references.
>
> Fixes: 376b3ff54c9a ("fbdev: Nuke FBINFO_MODULE")
> Signed-off-by: Arnd Bergmann <[email protected]>
Patch queued for 4.14, thanks.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics