| From 1dc19c2755acca65f4339ff935879ef12b3ad7bd Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 3 Apr 2024 10:06:31 +0200 |
| Subject: fbdev: sisfb: hide unused variables |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ Upstream commit 688cf598665851b9e8cb5083ff1d208ce43d10ff ] |
| |
| Building with W=1 shows that a couple of variables in this driver are only |
| used in certain configurations: |
| |
| drivers/video/fbdev/sis/init301.c:239:28: error: 'SiS_Part2CLVX_6' defined but not used [-Werror=unused-const-variable=] |
| 239 | static const unsigned char SiS_Part2CLVX_6[] = { /* 1080i */ |
| | ^~~~~~~~~~~~~~~ |
| drivers/video/fbdev/sis/init301.c:230:28: error: 'SiS_Part2CLVX_5' defined but not used [-Werror=unused-const-variable=] |
| 230 | static const unsigned char SiS_Part2CLVX_5[] = { /* 750p */ |
| | ^~~~~~~~~~~~~~~ |
| drivers/video/fbdev/sis/init301.c:211:28: error: 'SiS_Part2CLVX_4' defined but not used [-Werror=unused-const-variable=] |
| 211 | static const unsigned char SiS_Part2CLVX_4[] = { /* PAL */ |
| | ^~~~~~~~~~~~~~~ |
| drivers/video/fbdev/sis/init301.c:192:28: error: 'SiS_Part2CLVX_3' defined but not used [-Werror=unused-const-variable=] |
| 192 | static const unsigned char SiS_Part2CLVX_3[] = { /* NTSC, 525i, 525p */ |
| | ^~~~~~~~~~~~~~~ |
| drivers/video/fbdev/sis/init301.c:184:28: error: 'SiS_Part2CLVX_2' defined but not used [-Werror=unused-const-variable=] |
| 184 | static const unsigned char SiS_Part2CLVX_2[] = { |
| | ^~~~~~~~~~~~~~~ |
| drivers/video/fbdev/sis/init301.c:176:28: error: 'SiS_Part2CLVX_1' defined but not used [-Werror=unused-const-variable=] |
| 176 | static const unsigned char SiS_Part2CLVX_1[] = { |
| | ^~~~~~~~~~~~~~~ |
| |
| This started showing up after the definitions were moved into the |
| source file from the header, which was not flagged by the compiler. |
| Move the definition into the appropriate #ifdef block that already |
| exists next to them. |
| |
| Fixes: 5908986ef348 ("video: fbdev: sis: avoid mismatched prototypes") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Helge Deller <deller@gmx.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/video/fbdev/sis/init301.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/video/fbdev/sis/init301.c b/drivers/video/fbdev/sis/init301.c |
| index a8fb41f1a2580..09329072004f4 100644 |
| --- a/drivers/video/fbdev/sis/init301.c |
| +++ b/drivers/video/fbdev/sis/init301.c |
| @@ -172,7 +172,7 @@ static const unsigned char SiS_HiTVGroup3_2[] = { |
| }; |
| |
| /* 301C / 302ELV extended Part2 TV registers (4 tap scaler) */ |
| - |
| +#ifdef CONFIG_FB_SIS_315 |
| static const unsigned char SiS_Part2CLVX_1[] = { |
| 0x00,0x00, |
| 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F,0x7D,0x20,0x04,0x7F,0x7D,0x1F,0x06,0x7E, |
| @@ -245,7 +245,6 @@ static const unsigned char SiS_Part2CLVX_6[] = { /* 1080i */ |
| 0xFF,0xFF, |
| }; |
| |
| -#ifdef CONFIG_FB_SIS_315 |
| /* 661 et al LCD data structure (2.03.00) */ |
| static const unsigned char SiS_LCDStruct661[] = { |
| /* 1024x768 */ |
| -- |
| 2.43.0 |
| |
