This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
This patch-set clears all of the W=1 warnings currently residing
in drivers/video.
Lee Jones (31):
video: fbdev: core: fbmon: Add missing description for 'specs'
video: of_display_timing: Provide missing description for 'dt'
video: fbdev: aty: atyfb_base: Remove superfluous code surrounding
'dac_type'
video: fbdev: aty: atyfb_base: Mark 'dac_type' as __maybe_unused
video: of_videomode: Fix formatting in kernel-doc header
video: fbdev: core: fb_notify: Demote non-conformant kernel-doc header
video: fbdev: riva: fbdev: Fix some kernel-doc misdemeanours
video: fbdev: sis: sis_main: Remove unused variable 'reg'
video: fbdev: sis: Remove superfluous include of 'init.h'
video: fbdev: riva: riva_hw: Remove a bunch of unused variables
video: fbdev: sis: init: Remove four unused variables
video: fbdev: sis: oem310: Remove some unused static const tables
video: fbdev: nvidia: nv_setup: Remove a couple of unused 'tmp'
variables
video: fbdev: aty: mach64_ct: Remove some set but unused variables
video: fbdev: via: lcd: Remove unused variable 'mode_crt_table'
video: fbdev: pm2fb: Fix some kernel-doc formatting issues
video: fbdev: aty: radeon_monitor: Remove unused variable 'mon_types'
video: fbdev: neofb: Remove unused variable 'CursorMem'
video: fbdev: tdfxfb: Remove unused variable 'tmp'
video: fbdev: core: fbcon: Mark 'pending' as __maybe_unused
video: fbdev: sstfb: Mark 3 debug variables as __maybe_unused
video: fbdev: cirrusfb: Remove unused variable 'dummy' from 'WHDR()'
video: fbdev: s1d13xxxfb: Mark debug variables as __maybe_unused
video: fbdev: s3c-fb: Fix some kernel-doc misdemeanours
video: fbdev: mx3fb: Remove unused variable 'enabled'
video: fbdev: riva: riva_hw: Remove set but unused variables 'vus_p'
and 'vus_n'
video: fbdev: sis: init: Remove unused variables 'cr_data2', 'VT' and
'HT'
video: fbdev: cirrusfb: Add description for 'info' and correct
spelling of 'regbase'
video: fbdev: s1d13xxxfb: Function name must be on the 2nd line in
kernel-doc
video: fbdev: s3c-fb: Remove unused variable 'var' from
's3c_fb_probe_win()'
video: fbdev: mx3fb: Fix some kernel-doc issues
drivers/video/fbdev/aty/atyfb_base.c | 5 +---
drivers/video/fbdev/aty/mach64_ct.c | 19 ++-----------
drivers/video/fbdev/aty/radeon_monitor.c | 4 +--
drivers/video/fbdev/cirrusfb.c | 20 +++++++-------
drivers/video/fbdev/core/fb_notify.c | 3 +--
drivers/video/fbdev/core/fbcon.c | 2 +-
drivers/video/fbdev/core/fbmon.c | 2 +-
drivers/video/fbdev/mx3fb.c | 11 ++++----
drivers/video/fbdev/neofb.c | 5 ----
drivers/video/fbdev/nvidia/nv_setup.c | 8 ++----
drivers/video/fbdev/pm2fb.c | 12 ++++-----
drivers/video/fbdev/riva/fbdev.c | 15 ++++-------
drivers/video/fbdev/riva/riva_hw.c | 30 +++++++--------------
drivers/video/fbdev/s1d13xxxfb.c | 5 ++--
drivers/video/fbdev/s3c-fb.c | 11 ++++----
drivers/video/fbdev/sis/init.c | 34 +++++-------------------
drivers/video/fbdev/sis/oem310.h | 20 --------------
drivers/video/fbdev/sis/sis.h | 1 -
drivers/video/fbdev/sis/sis_main.c | 9 +++----
drivers/video/fbdev/sstfb.c | 2 +-
drivers/video/fbdev/tdfxfb.c | 4 +--
drivers/video/fbdev/via/lcd.c | 4 +--
drivers/video/of_display_timing.c | 1 +
drivers/video/of_videomode.c | 10 +++----
24 files changed, 72 insertions(+), 165 deletions(-)
Cc: Alan Cox <[email protected]>
Cc: Alex Dewar <[email protected]>
Cc: Alex Kern <[email protected]>
Cc: Ani Joshi <[email protected]>
Cc: Ani Joshi <[email protected]>
Cc: Anthony Tong <[email protected]>
Cc: Antonino Daplas <[email protected]>
Cc: Antonino Daplas <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Bartlomiej Zolnierkiewicz <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Brad Douglas <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: "Eddie C. Dost" <[email protected]>
Cc: Egbert Eich <[email protected]>
Cc: Emmanuel Marty <[email protected]>
Cc: Evgeny Novikov <[email protected]>
Cc: Florian Tobias Schandinat <[email protected]>
Cc: Frodo Looijaard <[email protected]>
Cc: Gerd Knorr <[email protected]>
Cc: Ghozlane Toumi <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Hannu Mallat <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: Ilario Nardinocchi <[email protected]>
Cc: Jakub Jelinek <[email protected]>
Cc: Jakub Jelinek <[email protected]>
Cc: James Simmons <[email protected]>
Cc: James Simmons <[email protected]>
Cc: Jeff Garzik <[email protected]>
Cc: Jes Sorensen <[email protected]>
Cc: Jim Hague <[email protected]>
Cc: Jingoo Han <[email protected]>
Cc: John Fremlin <[email protected]>
Cc: Kristoffer Ericson <[email protected]>
Cc: [email protected]
Cc: "Mark D. Studebaker" <[email protected]>
Cc: Martin Mares <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Oliver Kropp <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Philip Edelbrock <[email protected]>
Cc: Ralph Metzler <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Software Engineering <[email protected]>
Cc: Steffen Trumtrar <[email protected]>
Cc: Thibaut VARENE <[email protected]>
Cc: "Thomas J. Moore" <[email protected]>
Cc: Thomas Winischhofer <[email protected]>
Cc: Urs Ganse <[email protected]>
Cc: Vaibhav Gupta <[email protected]>
Cc: William Rucklidge <[email protected]>
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/nvidia/nv_setup.c: In function ‘NVWriteAttr’:
drivers/video/fbdev/nvidia/nv_setup.c:92:14: warning: variable ‘tmp’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/nvidia/nv_setup.c: In function ‘NVReadAttr’:
drivers/video/fbdev/nvidia/nv_setup.c:104:14: warning: variable ‘tmp’ set but not used [-Wunused-but-set-variable]
Cc: Antonino Daplas <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/nvidia/nv_setup.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/nvidia/nv_setup.c b/drivers/video/fbdev/nvidia/nv_setup.c
index 2fa68669613af..47a96a066f998 100644
--- a/drivers/video/fbdev/nvidia/nv_setup.c
+++ b/drivers/video/fbdev/nvidia/nv_setup.c
@@ -89,9 +89,7 @@ u8 NVReadSeq(struct nvidia_par *par, u8 index)
}
void NVWriteAttr(struct nvidia_par *par, u8 index, u8 value)
{
- volatile u8 tmp;
-
- tmp = VGA_RD08(par->PCIO, par->IOBase + 0x0a);
+ VGA_RD08(par->PCIO, par->IOBase + 0x0a);
if (par->paletteEnabled)
index &= ~0x20;
else
@@ -101,9 +99,7 @@ void NVWriteAttr(struct nvidia_par *par, u8 index, u8 value)
}
u8 NVReadAttr(struct nvidia_par *par, u8 index)
{
- volatile u8 tmp;
-
- tmp = VGA_RD08(par->PCIO, par->IOBase + 0x0a);
+ VGA_RD08(par->PCIO, par->IOBase + 0x0a);
if (par->paletteEnabled)
index &= ~0x20;
else
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/core/fb_notify.c:44: warning: Function parameter or member 'val' not described in 'fb_notifier_call_chain'
drivers/video/fbdev/core/fb_notify.c:44: warning: Function parameter or member 'v' not described in 'fb_notifier_call_chain'
Cc: Antonino Daplas <[email protected]>
Cc: Brad Douglas <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/core/fb_notify.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/core/fb_notify.c b/drivers/video/fbdev/core/fb_notify.c
index 74c2da5288848..1f142182fb40e 100644
--- a/drivers/video/fbdev/core/fb_notify.c
+++ b/drivers/video/fbdev/core/fb_notify.c
@@ -36,9 +36,8 @@ int fb_unregister_client(struct notifier_block *nb)
}
EXPORT_SYMBOL(fb_unregister_client);
-/**
+/*
* fb_notifier_call_chain - notify clients of fb_events
- *
*/
int fb_notifier_call_chain(unsigned long val, void *v)
{
--
2.25.1
Also fix a formatting issue
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/core/fbmon.c:617: warning: Function parameter or member 'specs' not described in 'fb_create_modedb'
drivers/video/fbdev/core/fbmon.c:1103: warning: bad line:
Cc: James Simmons <[email protected]>
Cc: Egbert Eich <[email protected]>
Cc: John Fremlin <[email protected]>
Cc: Ani Joshi <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/core/fbmon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 1bf82dbc9e3cf..82f856fe3919f 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -605,6 +605,7 @@ static void get_detailed_timing(unsigned char *block,
* fb_create_modedb - create video mode database
* @edid: EDID data
* @dbsize: database size
+ * @specs: framebuffer montior specifications
*
* RETURNS: struct fb_videomode, @dbsize contains length of database
*
@@ -1100,7 +1101,6 @@ static u32 fb_get_hblank_by_hfreq(u32 hfreq, u32 xres)
* 2 * M
* M = 300;
* C = 30;
-
*/
static u32 fb_get_hblank_by_dclk(u32 dclk, u32 xres)
{
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/of_display_timing.c:58: warning: Function parameter or member 'dt' not described in 'of_parse_display_timing'
Cc: Steffen Trumtrar <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/of_display_timing.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index abc9ada798ee8..9f21f7dc85292 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -52,6 +52,7 @@ static int parse_timing_property(const struct device_node *np, const char *name,
/**
* of_parse_display_timing - parse display_timing entry from device_node
* @np: device_node with the properties
+ * @dt: Display timing information
**/
static int of_parse_display_timing(const struct device_node *np,
struct display_timing *dt)
--
2.25.1
Neither 'sis.h' nor any of its consumers uses these tables.
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/sis/init.h:144:28: warning: ‘SiS_VGA_DAC’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:132:28: warning: ‘SiS_EGA_DAC’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:120:28: warning: ‘SiS_CGA_DAC’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:108:28: warning: ‘SiS_MDA_DAC’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:106:29: warning: ‘ModeIndex_310_2048x1536’ defined but not used [-Wunused-const-variable
drivers/video/fbdev/sis/init.h:105:29: warning: ‘ModeIndex_300_2048x1536’ defined but not used [-Wunused-const-variable
drivers/video/fbdev/sis/init.h:104:29: warning: ‘ModeIndex_1920x1440’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:103:29: warning: ‘ModeIndex_1920x1080’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:102:29: warning: ‘ModeIndex_1600x1200’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:101:29: warning: ‘ModeIndex_1680x1050’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/init.h:100:29: warning: ‘ModeIndex_1400x1050’ defined but not used [-Wunused-const-variable=]
NB: Snipped - there are 277 of these!
Cc: Thomas Winischhofer <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/sis/sis.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/video/fbdev/sis/sis.h b/drivers/video/fbdev/sis/sis.h
index 9f4c3093ccb36..d632f096083b3 100644
--- a/drivers/video/fbdev/sis/sis.h
+++ b/drivers/video/fbdev/sis/sis.h
@@ -15,7 +15,6 @@
#include "vgatypes.h"
#include "vstruct.h"
-#include "init.h"
#define VER_MAJOR 1
#define VER_MINOR 8
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/neofb.c: In function ‘neo_init_hw’:
drivers/video/fbdev/neofb.c:1846:6: warning: variable ‘CursorMem’ set but not used [-Wunused-but-set-variable]
Cc: Evgeny Novikov <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Oliver Kropp <[email protected]>
Cc: "Thomas J. Moore" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/neofb.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c
index 09a20d4ab35f2..bec199a34037e 100644
--- a/drivers/video/fbdev/neofb.c
+++ b/drivers/video/fbdev/neofb.c
@@ -1843,7 +1843,6 @@ static int neo_init_hw(struct fb_info *info)
struct neofb_par *par = info->par;
int videoRam = 896;
int maxClock = 65000;
- int CursorMem = 1024;
int CursorOff = 0x100;
DBG("neo_init_hw");
@@ -1895,26 +1894,22 @@ static int neo_init_hw(struct fb_info *info)
case FB_ACCEL_NEOMAGIC_NM2070:
case FB_ACCEL_NEOMAGIC_NM2090:
case FB_ACCEL_NEOMAGIC_NM2093:
- CursorMem = 2048;
CursorOff = 0x100;
break;
case FB_ACCEL_NEOMAGIC_NM2097:
case FB_ACCEL_NEOMAGIC_NM2160:
- CursorMem = 1024;
CursorOff = 0x100;
break;
case FB_ACCEL_NEOMAGIC_NM2200:
case FB_ACCEL_NEOMAGIC_NM2230:
case FB_ACCEL_NEOMAGIC_NM2360:
case FB_ACCEL_NEOMAGIC_NM2380:
- CursorMem = 1024;
CursorOff = 0x1000;
par->neo2200 = (Neo2200 __iomem *) par->mmio_vbase;
break;
}
/*
- info->sprite.size = CursorMem;
info->sprite.scan_align = 1;
info->sprite.buf_align = 1;
info->sprite.flags = FB_PIXMAP_IO;
--
2.25.1
'dac_type' is only used in the '#ifdef CONFIG_ATARI' clause.
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/aty/atyfb_base.c: In function ‘aty_init’:
drivers/video/fbdev/aty/atyfb_base.c:2363:6: warning: variable ‘dac_type’ set but not used [-Wunused-but-set-variable]
Cc: Vaibhav Gupta <[email protected]>
Cc: Alex Kern <[email protected]>
Cc: "Eddie C. Dost" <[email protected]>
Cc: Anthony Tong <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/aty/atyfb_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 11c328f0585ce..9b056b49f2807 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -2360,7 +2360,7 @@ static int aty_init(struct fb_info *info)
#ifdef CONFIG_FB_ATY_GX
if (!M64_HAS(INTEGRATED)) {
u32 stat0;
- u8 dac_type, dac_subtype, clk_type;
+ u8 __maybe_unused dac_type, dac_subtype, clk_type;
stat0 = aty_ld_le32(CNFG_STAT0, par);
par->bus_type = (stat0 >> 0) & 0x07;
par->ram_type = (stat0 >> 3) & 0x07;
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/sis/init.c: In function ‘SiS_SetCRT1ModeRegs’:
drivers/video/fbdev/sis/init.c:2651:49: warning: variable ‘resindex’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/sis/init.c: In function ‘SiS_Generic_ConvertCRData’:
drivers/video/fbdev/sis/init.c:3544:19: warning: variable ‘A’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/sis/init.c:3542:34: warning: variable ‘VBS’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/sis/init.c:3541:34: warning: variable ‘HBS’ set but not used [-Wunused-but-set-variable]
Cc: Thomas Winischhofer <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/sis/init.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c
index fde27feae5d0c..4510272ad297a 100644
--- a/drivers/video/fbdev/sis/init.c
+++ b/drivers/video/fbdev/sis/init.c
@@ -2648,7 +2648,7 @@ static void
SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
unsigned short ModeIdIndex, unsigned short RRTI)
{
- unsigned short data, infoflag = 0, modeflag, resindex;
+ unsigned short data, infoflag = 0, modeflag;
#ifdef CONFIG_FB_SIS_315
unsigned char *ROMAddr = SiS_Pr->VirtualRomBase;
unsigned short data2, data3;
@@ -2659,7 +2659,7 @@ SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
if(SiS_Pr->UseCustomMode) {
infoflag = SiS_Pr->CInfoFlag;
} else {
- resindex = SiS_GetResInfo(SiS_Pr, ModeNo, ModeIdIndex);
+ SiS_GetResInfo(SiS_Pr, ModeNo, ModeIdIndex);
if(ModeNo > 0x13) {
infoflag = SiS_Pr->SiS_RefIndex[RRTI].Ext_InfoFlag;
}
@@ -3538,16 +3538,15 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
struct fb_var_screeninfo *var, bool writeres
)
{
- unsigned short HRE, HBE, HRS, HBS, HDE, HT;
- unsigned short VRE, VBE, VRS, VBS, VDE, VT;
+ unsigned short HRE, HBE, HRS, HDE, HT;
+ unsigned short VRE, VBE, VRS, VDE, VT;
unsigned char sr_data, cr_data, cr_data2;
- int A, B, C, D, E, F, temp;
+ int B, C, D, E, F, temp;
sr_data = crdata[14];
/* Horizontal total */
HT = crdata[0] | ((unsigned short)(sr_data & 0x03) << 8);
- A = HT + 5;
/* Horizontal display enable end */
HDE = crdata[1] | ((unsigned short)(sr_data & 0x0C) << 6);
@@ -3557,9 +3556,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
HRS = crdata[4] | ((unsigned short)(sr_data & 0xC0) << 2);
F = HRS - E - 3;
- /* Horizontal blank start */
- HBS = crdata[2] | ((unsigned short)(sr_data & 0x30) << 4);
-
sr_data = crdata[15];
cr_data = crdata[5];
@@ -3593,7 +3589,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
((unsigned short)(cr_data & 0x01) << 8) |
((unsigned short)(cr_data & 0x20) << 4) |
((unsigned short)(sr_data & 0x01) << 10);
- A = VT + 2;
/* Vertical display enable end */
VDE = crdata[10] |
@@ -3611,12 +3606,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
cr_data2 = (crdata[16] & 0x01) << 5;
- /* Vertical blank start */
- VBS = crdata[11] |
- ((unsigned short)(cr_data & 0x08) << 5) |
- ((unsigned short)(cr_data2 & 0x20) << 4) |
- ((unsigned short)(sr_data & 0x04) << 8);
-
/* Vertical blank end */
VBE = crdata[12] | ((unsigned short)(sr_data & 0x10) << 4);
temp = VBE - ((E - 1) & 511);
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/riva/fbdev.c:485: warning: Function parameter or member 'data8' not described in 'rivafb_load_cursor_image'
drivers/video/fbdev/riva/fbdev.c:485: warning: Excess function parameter 'data' description in 'rivafb_load_cursor_image'
drivers/video/fbdev/riva/fbdev.c:863: warning: Function parameter or member 'var' not described in 'rivafb_do_maximize'
drivers/video/fbdev/riva/fbdev.c:863: warning: Function parameter or member 'nom' not described in 'rivafb_do_maximize'
drivers/video/fbdev/riva/fbdev.c:1229: warning: Excess function parameter 'con' description in 'rivafb_pan_display'
Cc: Antonino Daplas <[email protected]>
Cc: Ani Joshi <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/riva/fbdev.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c
index ce55b9d2e862b..8adf9cf353410 100644
--- a/drivers/video/fbdev/riva/fbdev.c
+++ b/drivers/video/fbdev/riva/fbdev.c
@@ -464,12 +464,12 @@ static inline void reverse_order(u32 *l)
/**
* rivafb_load_cursor_image - load cursor image to hardware
- * @data: address to monochrome bitmap (1 = foreground color, 0 = background)
+ * @data8: address to monochrome bitmap (1 = foreground color, 0 = background)
* @par: pointer to private data
- * @w: width of cursor image in pixels
- * @h: height of cursor image in scanlines
* @bg: background color (ARGB1555) - alpha bit determines opacity
* @fg: foreground color (ARGB1555)
+ * @w: width of cursor image in pixels
+ * @h: height of cursor image in scanlines
*
* DESCRIPTiON:
* Loads cursor image based on a monochrome source and mask bitmap. The
@@ -840,19 +840,15 @@ static void riva_update_var(struct fb_var_screeninfo *var,
NVTRACE_LEAVE();
}
-/**
- * rivafb_do_maximize -
+/*
+ * rivafb_do_maximize
* @info: pointer to fb_info object containing info for current riva board
- * @var:
- * @nom:
- * @den:
*
* DESCRIPTION:
* .
*
* RETURNS:
* -EINVAL on failure, 0 on success
- *
*
* CALLED FROM:
* rivafb_check_var()
@@ -1214,7 +1210,6 @@ static int rivafb_set_par(struct fb_info *info)
/**
* rivafb_pan_display
* @var: standard kernel fb changeable data
- * @con: TODO
* @info: pointer to fb_info object containing info for current riva board
*
* DESCRIPTION:
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/sis/sis_main.c: In function ‘sisfb_post_xgi_ddr2’:
drivers/video/fbdev/sis/sis_main.c:5032:5: warning: variable ‘reg’ set but not used [-Wunused-but-set-variable]
Cc: Thomas Winischhofer <[email protected]>
Cc: Gerd Knorr <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/sis/sis_main.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
index 03c736f6f3d08..266a5582f94d3 100644
--- a/drivers/video/fbdev/sis/sis_main.c
+++ b/drivers/video/fbdev/sis/sis_main.c
@@ -5029,7 +5029,6 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb)
static const u8 cs168[8] = {
0x48, 0x78, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00
};
- u8 reg;
u8 v1;
u8 v2;
u8 v3;
@@ -5037,9 +5036,9 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb)
SiS_SetReg(SISCR, 0xb0, 0x80); /* DDR2 dual frequency mode */
SiS_SetReg(SISCR, 0x82, 0x77);
SiS_SetReg(SISCR, 0x86, 0x00);
- reg = SiS_GetReg(SISCR, 0x86);
+ SiS_GetReg(SISCR, 0x86);
SiS_SetReg(SISCR, 0x86, 0x88);
- reg = SiS_GetReg(SISCR, 0x86);
+ SiS_GetReg(SISCR, 0x86);
v1 = cs168[regb]; v2 = cs160[regb]; v3 = cs158[regb];
if (ivideo->haveXGIROM) {
v1 = bios[regb + 0x168];
@@ -5049,9 +5048,9 @@ static void sisfb_post_xgi_ddr2(struct sis_video_info *ivideo, u8 regb)
SiS_SetReg(SISCR, 0x86, v1);
SiS_SetReg(SISCR, 0x82, 0x77);
SiS_SetReg(SISCR, 0x85, 0x00);
- reg = SiS_GetReg(SISCR, 0x85);
+ SiS_GetReg(SISCR, 0x85);
SiS_SetReg(SISCR, 0x85, 0x88);
- reg = SiS_GetReg(SISCR, 0x85);
+ SiS_GetReg(SISCR, 0x85);
SiS_SetReg(SISCR, 0x85, v2);
SiS_SetReg(SISCR, 0x82, v3);
SiS_SetReg(SISCR, 0x98, 0x01);
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/sis/oem310.h:213:28: warning: ‘SiS_TVDelay661_301B’ defined but not used [-Wunused-const-variable=]
drivers/video/fbdev/sis/oem310.h:203:28: warning: ‘SiS_TVDelay661_301’ defined but not used [-Wunused-const-variable=]
Cc: Thomas Winischhofer <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/sis/oem310.h | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/drivers/video/fbdev/sis/oem310.h b/drivers/video/fbdev/sis/oem310.h
index 8fce56e4482c0..5f7b503ed2a06 100644
--- a/drivers/video/fbdev/sis/oem310.h
+++ b/drivers/video/fbdev/sis/oem310.h
@@ -200,26 +200,6 @@ static const unsigned char SiS310_TVDelayCompensation_651302LV[] = /* M650, 651,
0x33,0x33
};
-static const unsigned char SiS_TVDelay661_301[] = /* 661, 301 */
-{
- 0x44,0x44,
- 0x44,0x44,
- 0x00,0x00,
- 0x44,0x44,
- 0x44,0x44,
- 0x44,0x44
-};
-
-static const unsigned char SiS_TVDelay661_301B[] = /* 661, 301B et al */
-{
- 0x44,0x44,
- 0x44,0x44,
- 0x00,0x00,
- 0x44,0x44,
- 0x44,0x44,
- 0x44,0x44
-};
-
static const unsigned char SiS310_TVDelayCompensation_LVDS[] = /* LVDS */
{
0x0a,0x0a,
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/via/lcd.c: In function ‘viafb_lcd_set_mode’:
drivers/video/fbdev/via/lcd.c:540:29: warning: variable ‘mode_crt_table’ set but not used [-Wunused-but-set-variable]
Cc: Florian Tobias Schandinat <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/via/lcd.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/via/lcd.c b/drivers/video/fbdev/via/lcd.c
index 4a869402d120d..088b962076b51 100644
--- a/drivers/video/fbdev/via/lcd.c
+++ b/drivers/video/fbdev/via/lcd.c
@@ -537,11 +537,9 @@ void viafb_lcd_set_mode(const struct fb_var_screeninfo *var, u16 cxres,
u32 clock;
struct via_display_timing timing;
struct fb_var_screeninfo panel_var;
- const struct fb_videomode *mode_crt_table, *panel_crt_table;
+ const struct fb_videomode *panel_crt_table;
DEBUG_MSG(KERN_INFO "viafb_lcd_set_mode!!\n");
- /* Get mode table */
- mode_crt_table = viafb_get_best_mode(set_hres, set_vres, 60);
/* Get panel table Pointer */
panel_crt_table = viafb_get_best_mode(panel_hres, panel_vres, 60);
viafb_fill_var_timing_info(&panel_var, panel_crt_table);
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/sis/init.c: In function ‘SiS_Generic_ConvertCRData’:
drivers/video/fbdev/sis/init.c:3543:37: warning: variable ‘cr_data2’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/sis/init.c:3542:39: warning: variable ‘VT’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/sis/init.c:3541:39: warning: variable ‘HT’ set but not used [-Wunused-but-set-variable]
Cc: Thomas Winischhofer <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/sis/init.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c
index 4510272ad297a..b77ea1a8825a5 100644
--- a/drivers/video/fbdev/sis/init.c
+++ b/drivers/video/fbdev/sis/init.c
@@ -3538,16 +3538,13 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
struct fb_var_screeninfo *var, bool writeres
)
{
- unsigned short HRE, HBE, HRS, HDE, HT;
- unsigned short VRE, VBE, VRS, VDE, VT;
- unsigned char sr_data, cr_data, cr_data2;
+ unsigned short HRE, HBE, HRS, HDE;
+ unsigned short VRE, VBE, VRS, VDE;
+ unsigned char sr_data, cr_data;
int B, C, D, E, F, temp;
sr_data = crdata[14];
- /* Horizontal total */
- HT = crdata[0] | ((unsigned short)(sr_data & 0x03) << 8);
-
/* Horizontal display enable end */
HDE = crdata[1] | ((unsigned short)(sr_data & 0x0C) << 6);
E = HDE + 1;
@@ -3584,12 +3581,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
sr_data = crdata[13];
cr_data = crdata[7];
- /* Vertical total */
- VT = crdata[6] |
- ((unsigned short)(cr_data & 0x01) << 8) |
- ((unsigned short)(cr_data & 0x20) << 4) |
- ((unsigned short)(sr_data & 0x01) << 10);
-
/* Vertical display enable end */
VDE = crdata[10] |
((unsigned short)(cr_data & 0x02) << 7) |
@@ -3604,8 +3595,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
((unsigned short)(sr_data & 0x08) << 7);
F = VRS + 1 - E;
- cr_data2 = (crdata[16] & 0x01) << 5;
-
/* Vertical blank end */
VBE = crdata[12] | ((unsigned short)(sr_data & 0x10) << 4);
temp = VBE - ((E - 1) & 511);
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/riva/riva_hw.c: In function ‘nv10CalcArbitration’:
drivers/video/fbdev/riva/riva_hw.c:845:23: warning: variable ‘vus_p’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:845:16: warning: variable ‘vus_n’ set but not used [-Wunused-but-set-variable]
Cc: Antonino Daplas <[email protected]>
Cc: Jeff Garzik <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/riva/riva_hw.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c
index 4ee63f7d84d3e..2bc510c24aa9e 100644
--- a/drivers/video/fbdev/riva/riva_hw.c
+++ b/drivers/video/fbdev/riva/riva_hw.c
@@ -842,7 +842,7 @@ static void nv10CalcArbitration
int found, mclk_extra, mclk_loop, cbs, m1;
int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
int us_m, us_m_min, us_n, us_p, crtc_drain_rate;
- int vus_m, vus_n, vus_p;
+ int vus_m;
int vpm_us, us_video, cpm_us, us_crt,clwm;
int clwm_rnd_down;
int m2us, us_pipe_min, p1clk, p2;
@@ -924,8 +924,6 @@ static void nv10CalcArbitration
us_pipe_min = us_m_min + us_n + us_p;
vus_m = mclk_loop *1000*1000 / mclk_freq; /* Mclk latency in us */
- vus_n = (4)*1000*1000 / nvclk_freq;/* nvclk latency in us */
- vus_p = 0*1000*1000 / pclk_freq;/* pclk latency in us */
if(video_enable) {
crtc_drain_rate = pclk_freq * bpp/8; /* MB/s */
--
2.25.1
Can't declare these under the same clause as their use, since
debugging is enabled manually with an '#if {0,1}', so mark them as
__maybe_unused instead to notify the compiler that this behaviour is
expected.
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/s1d13xxxfb.c: In function ‘s1d13xxxfb_fetch_hw_state’:
drivers/video/fbdev/s1d13xxxfb.c:644:16: warning: variable ‘is_dual’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/s1d13xxxfb.c:643:11: warning: variable ‘lcd_bpp’ set but not used [-Wunused-but-set-variable]
Cc: Kristoffer Ericson <[email protected]>
Cc: Thibaut VARENE <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/s1d13xxxfb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
index 4541afcf9386e..e6e8bc74412c6 100644
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c
@@ -640,8 +640,8 @@ static void s1d13xxxfb_fetch_hw_state(struct fb_info *info)
u16 offset;
u32 xres, yres;
u32 xres_virtual, yres_virtual;
- int bpp, lcd_bpp;
- int is_color, is_dual, is_tft;
+ int bpp, __maybe_unused lcd_bpp;
+ int is_color, __maybe_unused is_dual, is_tft;
int lcd_enabled, crt_enabled;
fix->type = FB_TYPE_PACKED_PIXELS;
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/s1d13xxxfb.c:515: warning: Cannot understand *
Cc: Kristoffer Ericson <[email protected]>
Cc: Thibaut VARENE <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/s1d13xxxfb.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
index e6e8bc74412c6..b21627c07f8d0 100644
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c
@@ -512,7 +512,6 @@ s1d13xxxfb_bitblt_copyarea(struct fb_info *info, const struct fb_copyarea *area)
}
/**
- *
* s1d13xxxfb_bitblt_solidfill - accelerated solidfill function
* @info : framebuffer structure
* @rect : fb_fillrect structure
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/aty/mach64_ct.c: In function ‘aty_init_pll_ct’:
drivers/video/fbdev/aty/mach64_ct.c:405:46: warning: variable ‘vga_dsp_on_off’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/aty/mach64_ct.c:405:30: warning: variable ‘vga_dsp_config’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/aty/mach64_ct.c:405:18: warning: variable ‘dsp_on_off’ set but not used [-Wunused-but-set-variable]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/aty/mach64_ct.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/video/fbdev/aty/mach64_ct.c b/drivers/video/fbdev/aty/mach64_ct.c
index f87cc81f4fa2b..23eececa1e9d7 100644
--- a/drivers/video/fbdev/aty/mach64_ct.c
+++ b/drivers/video/fbdev/aty/mach64_ct.c
@@ -402,7 +402,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
struct atyfb_par *par = (struct atyfb_par *) info->par;
u8 mpost_div, xpost_div, sclk_post_div_real;
u32 q, memcntl, trp;
- u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off;
+ u32 dsp_config;
#ifdef DEBUG
int pllmclk, pllsclk;
#endif
@@ -488,25 +488,10 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
/* Allow BIOS to override */
dsp_config = aty_ld_le32(DSP_CONFIG, par);
- dsp_on_off = aty_ld_le32(DSP_ON_OFF, par);
- vga_dsp_config = aty_ld_le32(VGA_DSP_CONFIG, par);
- vga_dsp_on_off = aty_ld_le32(VGA_DSP_ON_OFF, par);
if (dsp_config)
pll->ct.dsp_loop_latency = (dsp_config & DSP_LOOP_LATENCY) >> 16;
-#if 0
- FIXME: is it relevant for us?
- if ((!dsp_on_off && !M64_HAS(RESET_3D)) ||
- ((dsp_on_off == vga_dsp_on_off) &&
- (!dsp_config || !((dsp_config ^ vga_dsp_config) & DSP_XCLKS_PER_QW)))) {
- vga_dsp_on_off &= VGA_DSP_OFF;
- vga_dsp_config &= VGA_DSP_XCLKS_PER_QW;
- if (ATIDivide(vga_dsp_on_off, vga_dsp_config, 5, 1) > 24)
- pll->ct.fifo_size = 32;
- else
- pll->ct.fifo_size = 24;
- }
-#endif
+
/* Exit if the user does not want us to tamper with the clock
rates of her chip. */
if (par->mclk_per == 0) {
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/s3c-fb.c:104: warning: Function parameter or member 'osd_stride' not described in 's3c_fb_variant'
drivers/video/fbdev/s3c-fb.c:174: warning: Function parameter or member 'variant' not described in 's3c_fb_win'
drivers/video/fbdev/s3c-fb.c:345: warning: Function parameter or member 'pixclk' not described in 's3c_fb_calc_pixclk'
drivers/video/fbdev/s3c-fb.c:345: warning: Excess function parameter 'pixclock' description in 's3c_fb_calc_pixclk'
drivers/video/fbdev/s3c-fb.c:742: warning: Function parameter or member 'transp' not described in 's3c_fb_setcolreg'
drivers/video/fbdev/s3c-fb.c:742: warning: Excess function parameter 'trans' description in 's3c_fb_setcolreg'
drivers/video/fbdev/s3c-fb.c:1142: warning: Function parameter or member 'sfb' not described in 's3c_fb_release_win'
drivers/video/fbdev/s3c-fb.c:1172: warning: Function parameter or member 'win_no' not described in 's3c_fb_probe_win'
Cc: Jingoo Han <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/s3c-fb.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index ba316bd56efd7..d33d7df77a6a5 100644
--- a/drivers/video/fbdev/s3c-fb.c
+++ b/drivers/video/fbdev/s3c-fb.c
@@ -75,6 +75,7 @@ struct s3c_fb;
* @buf_size: Offset of buffer size registers.
* @buf_end: Offset of buffer end registers.
* @osd: The base for the OSD registers.
+ * @osd_stride: The OSD stride value.
* @palette: Address of palette memory, or 0 if none.
* @has_prtcon: Set if has PRTCON register.
* @has_shadowcon: Set if has SHADOWCON register.
@@ -155,7 +156,7 @@ struct s3c_fb_palette {
* @windata: The platform data supplied for the window configuration.
* @parent: The hardware that this window is part of.
* @fbinfo: Pointer pack to the framebuffer info for this window.
- * @varint: The variant information for this window.
+ * @variant: The variant information for this window.
* @palette_buffer: Buffer/cache to hold palette entries.
* @pseudo_palette: For use in TRUECOLOUR modes for entries 0..15/
* @index: The window number of this window.
@@ -336,7 +337,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
/**
* s3c_fb_calc_pixclk() - calculate the divider to create the pixel clock.
* @sfb: The hardware state.
- * @pixclock: The pixel clock wanted, in picoseconds.
+ * @pixclk: The pixel clock wanted, in picoseconds.
*
* Given the specified pixel clock, work out the necessary divider to get
* close to the output frequency.
@@ -733,7 +734,7 @@ static inline unsigned int chan_to_field(unsigned int chan,
* @red: The red field for the palette data.
* @green: The green field for the palette data.
* @blue: The blue field for the palette data.
- * @trans: The transparency (alpha) field for the palette data.
+ * @transp: The transparency (alpha) field for the palette data.
* @info: The framebuffer being changed.
*/
static int s3c_fb_setcolreg(unsigned regno,
@@ -1133,6 +1134,7 @@ static void s3c_fb_free_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)
/**
* s3c_fb_release_win() - release resources for a framebuffer window.
+ * @sfb: The base resources for the hardware.
* @win: The window to cleanup the resources for.
*
* Release the resources that where claimed for the hardware window,
@@ -1160,6 +1162,7 @@ static void s3c_fb_release_win(struct s3c_fb *sfb, struct s3c_fb_win *win)
/**
* s3c_fb_probe_win() - register an hardware window
* @sfb: The base resources for the hardware
+ * @win_no: The ID of the window to be registered
* @variant: The variant information for this window.
* @res: Pointer to where to place the resultant window.
*
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/s3c-fb.c: In function ‘s3c_fb_probe_win’:
drivers/video/fbdev/s3c-fb.c:1176:28: warning: variable ‘var’ set but not used [-Wunused-but-set-variable]
Cc: Jingoo Han <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/s3c-fb.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index d33d7df77a6a5..91daeca5ca392 100644
--- a/drivers/video/fbdev/s3c-fb.c
+++ b/drivers/video/fbdev/s3c-fb.c
@@ -1173,7 +1173,6 @@ static int s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
struct s3c_fb_win_variant *variant,
struct s3c_fb_win **res)
{
- struct fb_var_screeninfo *var;
struct fb_videomode initmode;
struct s3c_fb_pd_win *windata;
struct s3c_fb_win *win;
@@ -1201,7 +1200,6 @@ static int s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
win = fbinfo->par;
*res = win;
- var = &fbinfo->var;
win->variant = *variant;
win->fbinfo = fbinfo;
win->parent = sfb;
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/mx3fb.c:738: warning: Function parameter or member 'fbi' not described in 'mx3fb_set_fix'
drivers/video/fbdev/mx3fb.c:738: warning: Excess function parameter 'info' description in 'mx3fb_set_fix'
drivers/video/fbdev/mx3fb.c:1109: warning: Function parameter or member 'blank' not described in 'mx3fb_blank'
drivers/video/fbdev/mx3fb.c:1109: warning: Function parameter or member 'fbi' not described in 'mx3fb_blank'
drivers/video/fbdev/mx3fb.c:1134: warning: Function parameter or member 'fbi' not described in 'mx3fb_pan_display'
drivers/video/fbdev/mx3fb.c:1134: warning: Excess function parameter 'info' description in 'mx3fb_pan_display'
drivers/video/fbdev/mx3fb.c:1393: warning: Function parameter or member 'dev' not described in 'mx3fb_init_fbinfo'
drivers/video/fbdev/mx3fb.c:1393: warning: Function parameter or member 'ops' not described in 'mx3fb_init_fbinfo'
Cc: Sam Ravnborg <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Software Engineering <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/mx3fb.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index d1c8f7a969ac3..a0fad25136fe5 100644
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -731,7 +731,7 @@ static int mx3fb_unmap_video_memory(struct fb_info *fbi);
/**
* mx3fb_set_fix() - set fixed framebuffer parameters from variable settings.
- * @info: framebuffer information pointer
+ * @fbi: framebuffer information pointer
* @return: 0 on success or negative error code on failure.
*/
static int mx3fb_set_fix(struct fb_info *fbi)
@@ -1104,6 +1104,8 @@ static void __blank(int blank, struct fb_info *fbi)
/**
* mx3fb_blank() - blank the display.
+ * @blank: blank mode (unblank, normal, {v,h}sync_suspend, powerdown)
+ * @fbi: framebuffer information pointer
*/
static int mx3fb_blank(int blank, struct fb_info *fbi)
{
@@ -1125,7 +1127,7 @@ static int mx3fb_blank(int blank, struct fb_info *fbi)
/**
* mx3fb_pan_display() - pan or wrap the display
* @var: variable screen buffer information.
- * @info: framebuffer information pointer.
+ * @fbi: framebuffer information pointer.
*
* We look only at xoffset, yoffset and the FB_VMODE_YWRAP flag
*/
@@ -1384,7 +1386,7 @@ static int mx3fb_unmap_video_memory(struct fb_info *fbi)
return 0;
}
-/**
+/*
* mx3fb_init_fbinfo() - initialize framebuffer information object.
* @return: initialized framebuffer structure.
*/
--
2.25.1
'pending' is only used if FBCONDEBUG is defined.
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/core/fbcon.c: In function ‘fbcon_exit’:
drivers/video/fbdev/core/fbcon.c:3295:7: warning: variable ‘pending’ set but not used [-Wunused-but-set-variable]
Cc: [email protected]
Cc: William Rucklidge <[email protected]>
Cc: Jes Sorensen <[email protected]>
Cc: Emmanuel Marty <[email protected]>
Cc: Jakub Jelinek <[email protected]>
Cc: Martin Mares <[email protected]>
Cc: Brad Douglas <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/core/fbcon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index bf61598bf1c39..f3d628fd07dc1 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -3292,7 +3292,7 @@ static void fbcon_exit(void)
#endif
for_each_registered_fb(i) {
- int pending = 0;
+ int __maybe_unused pending = 0;
mapped = 0;
info = registered_fb[i];
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/cirrusfb.c:2815: warning: Function parameter or member 'info' not described in 'cirrusfb_dbg_print_regs'
drivers/video/fbdev/cirrusfb.c:2815: warning: Function parameter or member 'regbase' not described in 'cirrusfb_dbg_print_regs'
drivers/video/fbdev/cirrusfb.c:2815: warning: Excess function parameter 'base' description in 'cirrusfb_dbg_print_regs'
drivers/video/fbdev/cirrusfb.c:2859: warning: Function parameter or member 'info' not described in 'cirrusfb_dbg_reg_dump'
drivers/video/fbdev/cirrusfb.c:2859: warning: Function parameter or member 'regbase' not described in 'cirrusfb_dbg_reg_dump'
drivers/video/fbdev/cirrusfb.c:2859: warning: Excess function parameter 'base' description in 'cirrusfb_dbg_reg_dump'
Cc: Jeff Garzik <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/cirrusfb.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c
index f05160fa34da9..bb2cc753c1cf5 100644
--- a/drivers/video/fbdev/cirrusfb.c
+++ b/drivers/video/fbdev/cirrusfb.c
@@ -2800,7 +2800,8 @@ static void bestclock(long freq, int *nom, int *den, int *div)
/**
* cirrusfb_dbg_print_regs
- * @base: If using newmmio, the newmmio base address, otherwise %NULL
+ * @info: frame buffer info structure
+ * @regbase: If using newmmio, the newmmio base address, otherwise %NULL
* @reg_class: type of registers to read: %CRT, or %SEQ
*
* DESCRIPTION:
@@ -2847,7 +2848,8 @@ static void cirrusfb_dbg_print_regs(struct fb_info *info,
/**
* cirrusfb_dbg_reg_dump
- * @base: If using newmmio, the newmmio base address, otherwise %NULL
+ * @info: frame buffer info structure
+ * @regbase: If using newmmio, the newmmio base address, otherwise %NULL
*
* DESCRIPTION:
* Dumps a list of interesting VGA and CIRRUSFB registers. If @base is %NULL,
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/tdfxfb.c: In function ‘att_outb’:
drivers/video/fbdev/tdfxfb.c:209:16: warning: variable ‘tmp’ set but not used [-Wunused-but-set-variable]
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Hannu Mallat <[email protected]>
Cc: Frodo Looijaard <[email protected]>
Cc: Philip Edelbrock <[email protected]>
Cc: Ralph Metzler <[email protected]>
Cc: "Mark D. Studebaker" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/tdfxfb.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/tdfxfb.c b/drivers/video/fbdev/tdfxfb.c
index f056d80f6359f..67e37a62b07c3 100644
--- a/drivers/video/fbdev/tdfxfb.c
+++ b/drivers/video/fbdev/tdfxfb.c
@@ -206,9 +206,7 @@ static inline u8 crt_inb(struct tdfx_par *par, u32 idx)
static inline void att_outb(struct tdfx_par *par, u32 idx, u8 val)
{
- unsigned char tmp;
-
- tmp = vga_inb(par, IS1_R);
+ vga_inb(par, IS1_R);
vga_outb(par, ATT_IW, idx);
vga_outb(par, ATT_IW, val);
}
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/cirrusfb.c: In function ‘WHDR’:
drivers/video/fbdev/cirrusfb.c:2466:16: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]
Cc: Jeff Garzik <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/cirrusfb.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c
index e9027172c0f55..f05160fa34da9 100644
--- a/drivers/video/fbdev/cirrusfb.c
+++ b/drivers/video/fbdev/cirrusfb.c
@@ -2463,8 +2463,6 @@ static void AttrOn(const struct cirrusfb_info *cinfo)
*/
static void WHDR(const struct cirrusfb_info *cinfo, unsigned char val)
{
- unsigned char dummy;
-
if (is_laguna(cinfo))
return;
if (cinfo->btype == BT_PICASSO) {
@@ -2473,18 +2471,18 @@ static void WHDR(const struct cirrusfb_info *cinfo, unsigned char val)
WGen(cinfo, VGA_PEL_MSK, 0x00);
udelay(200);
/* next read dummy from pixel address (3c8) */
- dummy = RGen(cinfo, VGA_PEL_IW);
+ RGen(cinfo, VGA_PEL_IW);
udelay(200);
}
/* now do the usual stuff to access the HDR */
- dummy = RGen(cinfo, VGA_PEL_MSK);
+ RGen(cinfo, VGA_PEL_MSK);
udelay(200);
- dummy = RGen(cinfo, VGA_PEL_MSK);
+ RGen(cinfo, VGA_PEL_MSK);
udelay(200);
- dummy = RGen(cinfo, VGA_PEL_MSK);
+ RGen(cinfo, VGA_PEL_MSK);
udelay(200);
- dummy = RGen(cinfo, VGA_PEL_MSK);
+ RGen(cinfo, VGA_PEL_MSK);
udelay(200);
WGen(cinfo, VGA_PEL_MSK, val);
@@ -2492,7 +2490,7 @@ static void WHDR(const struct cirrusfb_info *cinfo, unsigned char val)
if (cinfo->btype == BT_PICASSO) {
/* now first reset HDR access counter */
- dummy = RGen(cinfo, VGA_PEL_IW);
+ RGen(cinfo, VGA_PEL_IW);
udelay(200);
/* and at the end, restore the mask value */
--
2.25.1
These are only used if SST_DEBUG_FUNC is set.
Declare them under the same clause as their use.
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/sstfb.c: In function ‘sst_detect_ics’:
drivers/video/fbdev/sstfb.c:934:26: warning: variable ‘n_clk1_b’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/sstfb.c:934:16: warning: variable ‘n_clk0_7’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/sstfb.c:934:6: warning: variable ‘n_clk0_1’ set but not used [-Wunused-but-set-variable]
Cc: Alex Dewar <[email protected]>
Cc: Bartlomiej Zolnierkiewicz <[email protected]>
Cc: Ghozlane Toumi <[email protected]>
Cc: James Simmons <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Urs Ganse <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: Alan Cox <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/sstfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/sstfb.c b/drivers/video/fbdev/sstfb.c
index c05cdabeb11c2..b8813a0b63b1d 100644
--- a/drivers/video/fbdev/sstfb.c
+++ b/drivers/video/fbdev/sstfb.c
@@ -931,7 +931,7 @@ static int sst_detect_ics(struct fb_info *info)
{
struct sstfb_par *par = info->par;
int m_clk0_1, m_clk0_7, m_clk1_b;
- int n_clk0_1, n_clk0_7, n_clk1_b;
+ int __maybe_unused n_clk0_1, __maybe_unused n_clk0_7, __maybe_unused n_clk1_b;
int i;
for (i = 0; i<5; i++ ) {
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/mx3fb.c: In function ‘sdc_disable_channel’:
drivers/video/fbdev/mx3fb.c:448:11: warning: variable ‘enabled’ set but not used [-Wunused-but-set-variable]
Cc: Sam Ravnborg <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Software Engineering <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/mx3fb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index 894617ddabcb6..d1c8f7a969ac3 100644
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -445,7 +445,6 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi)
static void sdc_disable_channel(struct mx3fb_info *mx3_fbi)
{
struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
- uint32_t enabled;
unsigned long flags;
if (mx3_fbi->txd == NULL)
@@ -453,7 +452,7 @@ static void sdc_disable_channel(struct mx3fb_info *mx3_fbi)
spin_lock_irqsave(&mx3fb->lock, flags);
- enabled = sdc_fb_uninit(mx3_fbi);
+ sdc_fb_uninit(mx3_fbi);
spin_unlock_irqrestore(&mx3fb->lock, flags);
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/of_videomode.c:32: warning: Function parameter or member 'np' not described in 'of_get_videomode'
drivers/video/of_videomode.c:32: warning: Function parameter or member 'vm' not described in 'of_get_videomode'
drivers/video/of_videomode.c:32: warning: Function parameter or member 'index' not described in 'of_get_videomode'
Cc: Steffen Trumtrar <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/of_videomode.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/of_videomode.c b/drivers/video/of_videomode.c
index 67aff2421c29e..97a220852977f 100644
--- a/drivers/video/of_videomode.c
+++ b/drivers/video/of_videomode.c
@@ -14,11 +14,11 @@
/**
* of_get_videomode - get the videomode #<index> from devicetree
- * @np - devicenode with the display_timings
- * @vm - set to return value
- * @index - index into list of display_timings
- * (Set this to OF_USE_NATIVE_MODE to use whatever mode is
- * specified as native mode in the DT.)
+ * @np: devicenode with the display_timings
+ * @vm: set to return value
+ * @index: index into list of display_timings
+ * (Set this to OF_USE_NATIVE_MODE to use whatever mode is
+ * specified as native mode in the DT.)
*
* DESCRIPTION:
* Get a list of all display timings and put the one
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/riva/riva_hw.c: In function ‘nv10CalcArbitration’:
drivers/video/fbdev/riva/riva_hw.c:849:9: warning: variable ‘pclks_2_top_fifo’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:848:43: warning: variable ‘vus_pipe’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:848:21: warning: variable ‘us_pipe’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:848:9: warning: variable ‘craw’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:846:27: warning: variable ‘vlwm’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:844:37: warning: variable ‘video_drain_rate’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:841:21: warning: variable ‘us_extra’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:840:55: warning: variable ‘vbs’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:839:25: warning: variable ‘cas’ set but not used [-Wunused-but-set-variable]
Cc: Antonino Daplas <[email protected]>
Cc: Jeff Garzik <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/riva/riva_hw.c | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c
index bcf9c4b4de311..4ee63f7d84d3e 100644
--- a/drivers/video/fbdev/riva/riva_hw.c
+++ b/drivers/video/fbdev/riva/riva_hw.c
@@ -836,17 +836,17 @@ static void nv10CalcArbitration
nv10_sim_state *arb
)
{
- int data, pagemiss, cas,width, video_enable, bpp;
- int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
- int nvclk_fill, us_extra;
+ int data, pagemiss, width, video_enable, bpp;
+ int nvclks, mclks, pclks, vpagemiss, crtpagemiss;
+ int nvclk_fill;
int found, mclk_extra, mclk_loop, cbs, m1;
int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
- int us_m, us_m_min, us_n, us_p, video_drain_rate, crtc_drain_rate;
+ int us_m, us_m_min, us_n, us_p, crtc_drain_rate;
int vus_m, vus_n, vus_p;
- int vpm_us, us_video, vlwm, cpm_us, us_crt,clwm;
+ int vpm_us, us_video, cpm_us, us_crt,clwm;
int clwm_rnd_down;
- int craw, m2us, us_pipe, us_pipe_min, vus_pipe, p1clk, p2;
- int pclks_2_top_fifo, min_mclk_extra;
+ int m2us, us_pipe_min, p1clk, p2;
+ int min_mclk_extra;
int us_min_mclk_extra;
fifo->valid = 1;
@@ -854,16 +854,13 @@ static void nv10CalcArbitration
mclk_freq = arb->mclk_khz;
nvclk_freq = arb->nvclk_khz;
pagemiss = arb->mem_page_miss;
- cas = arb->mem_latency;
width = arb->memory_width/64;
video_enable = arb->enable_video;
bpp = arb->pix_bpp;
mp_enable = arb->enable_mp;
clwm = 0;
- vlwm = 1024;
cbs = 512;
- vbs = 512;
pclks = 4; /* lwm detect. */
@@ -924,17 +921,13 @@ static void nv10CalcArbitration
us_min_mclk_extra = min_mclk_extra *1000*1000 / mclk_freq;
us_n = nvclks*1000*1000 / nvclk_freq;/* nvclk latency in us */
us_p = pclks*1000*1000 / pclk_freq;/* nvclk latency in us */
- us_pipe = us_m + us_n + us_p;
us_pipe_min = us_m_min + us_n + us_p;
- us_extra = 0;
vus_m = mclk_loop *1000*1000 / mclk_freq; /* Mclk latency in us */
vus_n = (4)*1000*1000 / nvclk_freq;/* nvclk latency in us */
vus_p = 0*1000*1000 / pclk_freq;/* pclk latency in us */
- vus_pipe = vus_m + vus_n + vus_p;
if(video_enable) {
- video_drain_rate = pclk_freq * 4; /* MB/s */
crtc_drain_rate = pclk_freq * bpp/8; /* MB/s */
vpagemiss = 1; /* self generating page miss */
@@ -993,7 +986,6 @@ static void nv10CalcArbitration
else if(crtc_drain_rate * 100 >= nvclk_fill * 98) {
clwm = 1024;
cbs = 512;
- us_extra = (cbs * 1000 * 1000)/ (8*width)/mclk_freq ;
}
}
}
@@ -1010,7 +1002,6 @@ static void nv10CalcArbitration
m1 = clwm + cbs - 1024; /* Amount of overfill */
m2us = us_pipe_min + us_min_mclk_extra;
- pclks_2_top_fifo = (1024-clwm)/(8*width);
/* pclk cycles to drain */
p1clk = m2us * pclk_freq/(1000*1000);
@@ -1038,14 +1029,13 @@ static void nv10CalcArbitration
min_mclk_extra--;
}
}
- craw = clwm;
if(clwm < (1024-cbs+8)) clwm = 1024-cbs+8;
data = (int)(clwm);
/* printf("CRT LWM: %f bytes, prog: 0x%x, bs: 256\n", clwm, data ); */
fifo->graphics_lwm = data; fifo->graphics_burst_size = cbs;
- /* printf("VID LWM: %f bytes, prog: 0x%x, bs: %d\n, ", vlwm, data, vbs ); */
+ /* printf("VID LWM: 1024 bytes, prog: 0x%x, bs: 512\n, ", data); */
fifo->video_lwm = 1024; fifo->video_burst_size = 512;
}
}
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/pm2fb.c:1515: warning: Function parameter or member 'pdev' not described in 'pm2fb_probe'
drivers/video/fbdev/pm2fb.c:1515: warning: Function parameter or member 'id' not described in 'pm2fb_probe'
drivers/video/fbdev/pm2fb.c:1721: warning: Function parameter or member 'pdev' not described in 'pm2fb_remove'
drivers/video/fbdev/pm2fb.c:1765: warning: Function parameter or member 'options' not described in 'pm2fb_setup'
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Jim Hague <[email protected]>
Cc: Ilario Nardinocchi <[email protected]>
Cc: Jakub Jelinek <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/pm2fb.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c
index 27893fa139b08..6a30096676374 100644
--- a/drivers/video/fbdev/pm2fb.c
+++ b/drivers/video/fbdev/pm2fb.c
@@ -1504,12 +1504,12 @@ static const struct fb_ops pm2fb_ops = {
/**
- * Device initialisation
+ * pm2fb_probe - Device initialisation
*
* Initialise and allocate resource for PCI device.
*
- * @param pdev PCI device.
- * @param id PCI device ID.
+ * @pdev: PCI device.
+ * @id: PCI device ID.
*/
static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
@@ -1711,11 +1711,11 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
/**
- * Device removal.
+ * pm2fb_remove - Device removal.
*
* Release all device resources.
*
- * @param pdev PCI device to clean up.
+ * @pdev: PCI device to clean up.
*/
static void pm2fb_remove(struct pci_dev *pdev)
{
@@ -1756,7 +1756,7 @@ MODULE_DEVICE_TABLE(pci, pm2fb_id_table);
#ifndef MODULE
-/**
+/*
* Parse user specified options.
*
* This is, comma-separated options following `video=pm2fb:'.
--
2.25.1
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/aty/radeon_monitor.c: In function ‘radeon_probe_screens’:
drivers/video/fbdev/aty/radeon_monitor.c:491:8: warning: variable ‘mon_types’ set but not used [-Wunused-but-set-variable]
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/video/fbdev/aty/radeon_monitor.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/aty/radeon_monitor.c b/drivers/video/fbdev/aty/radeon_monitor.c
index 9966c58aa26cd..5ff01aa389381 100644
--- a/drivers/video/fbdev/aty/radeon_monitor.c
+++ b/drivers/video/fbdev/aty/radeon_monitor.c
@@ -488,12 +488,10 @@ void radeon_probe_screens(struct radeonfb_info *rinfo,
#if defined(DEBUG) && defined(CONFIG_FB_RADEON_I2C)
{
u8 *EDIDs[4] = { NULL, NULL, NULL, NULL };
- int mon_types[4] = {MT_NONE, MT_NONE, MT_NONE, MT_NONE};
int i;
for (i = 0; i < 4; i++)
- mon_types[i] = radeon_probe_i2c_connector(rinfo,
- i+1, &EDIDs[i]);
+ radeon_probe_i2c_connector(rinfo, i+1, &EDIDs[i]);
}
#endif /* DEBUG */
/*
--
2.25.1
Hi,
If I remember well, the removed lines have to do with the VGA/accelerator
mode of the chip. The current driver always runs the chip in accelerator
mode. Suppose you would want to support high resolution hardware text
modes with the driver (fbdev bpp=0), then you would need to switch the
chip into VGA mode mode and then the removed lines become relevant.
I did some experiments with this when I was working on the driver, but
because the documentation was silent about the behaviour of extended
CRTC registers in VGA mode, I failed to make hardware text modes to work
properly.
The #if 0 was there so code was already there in case me or someone else
would pick it up again.
Best regards,
Daniël Mantione
Op Wed, 13 Jan 2021, schreef Lee Jones:
> Fixes the following W=1 kernel build warning(s):
>
> drivers/video/fbdev/aty/mach64_ct.c: In function ‘aty_init_pll_ct’:
> drivers/video/fbdev/aty/mach64_ct.c:405:46: warning: variable ‘vga_dsp_on_off’ set but not used [-Wunused-but-set-variable]
> drivers/video/fbdev/aty/mach64_ct.c:405:30: warning: variable ‘vga_dsp_config’ set but not used [-Wunused-but-set-variable]
> drivers/video/fbdev/aty/mach64_ct.c:405:18: warning: variable ‘dsp_on_off’ set but not used [-Wunused-but-set-variable]
>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Lee Jones <[email protected]>
> ---
> drivers/video/fbdev/aty/mach64_ct.c | 19 ++-----------------
> 1 file changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/video/fbdev/aty/mach64_ct.c b/drivers/video/fbdev/aty/mach64_ct.c
> index f87cc81f4fa2b..23eececa1e9d7 100644
> --- a/drivers/video/fbdev/aty/mach64_ct.c
> +++ b/drivers/video/fbdev/aty/mach64_ct.c
> @@ -402,7 +402,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
> struct atyfb_par *par = (struct atyfb_par *) info->par;
> u8 mpost_div, xpost_div, sclk_post_div_real;
> u32 q, memcntl, trp;
> - u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off;
> + u32 dsp_config;
> #ifdef DEBUG
> int pllmclk, pllsclk;
> #endif
> @@ -488,25 +488,10 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
>
> /* Allow BIOS to override */
> dsp_config = aty_ld_le32(DSP_CONFIG, par);
> - dsp_on_off = aty_ld_le32(DSP_ON_OFF, par);
> - vga_dsp_config = aty_ld_le32(VGA_DSP_CONFIG, par);
> - vga_dsp_on_off = aty_ld_le32(VGA_DSP_ON_OFF, par);
>
> if (dsp_config)
> pll->ct.dsp_loop_latency = (dsp_config & DSP_LOOP_LATENCY) >> 16;
> -#if 0
> - FIXME: is it relevant for us?
> - if ((!dsp_on_off && !M64_HAS(RESET_3D)) ||
> - ((dsp_on_off == vga_dsp_on_off) &&
> - (!dsp_config || !((dsp_config ^ vga_dsp_config) & DSP_XCLKS_PER_QW)))) {
> - vga_dsp_on_off &= VGA_DSP_OFF;
> - vga_dsp_config &= VGA_DSP_XCLKS_PER_QW;
> - if (ATIDivide(vga_dsp_on_off, vga_dsp_config, 5, 1) > 24)
> - pll->ct.fifo_size = 32;
> - else
> - pll->ct.fifo_size = 24;
> - }
> -#endif
> +
> /* Exit if the user does not want us to tamper with the clock
> rates of her chip. */
> if (par->mclk_per == 0) {
> --
> 2.25.1
>
On Wed, 13 Jan 2021, Daniël Mantione wrote:
> Hi,
>
> If I remember well, the removed lines have to do with the VGA/accelerator
> mode of the chip. The current driver always runs the chip in accelerator
> mode. Suppose you would want to support high resolution hardware text modes
> with the driver (fbdev bpp=0), then you would need to switch the chip into
> VGA mode mode and then the removed lines become relevant.
>
> I did some experiments with this when I was working on the driver, but
> because the documentation was silent about the behaviour of extended CRTC
> registers in VGA mode, I failed to make hardware text modes to work
> properly.
>
> The #if 0 was there so code was already there in case me or someone else
> would pick it up again.
This code has been commented out for *at least* 16 years.
Probably time to let it go. :)
> Best regards,
>
> Daniël Mantione
>
> Op Wed, 13 Jan 2021, schreef Lee Jones:
>
> > Fixes the following W=1 kernel build warning(s):
> >
> > drivers/video/fbdev/aty/mach64_ct.c: In function ‘aty_init_pll_ct’:
> > drivers/video/fbdev/aty/mach64_ct.c:405:46: warning: variable ‘vga_dsp_on_off’ set but not used [-Wunused-but-set-variable]
> > drivers/video/fbdev/aty/mach64_ct.c:405:30: warning: variable ‘vga_dsp_config’ set but not used [-Wunused-but-set-variable]
> > drivers/video/fbdev/aty/mach64_ct.c:405:18: warning: variable ‘dsp_on_off’ set but not used [-Wunused-but-set-variable]
> >
> > Cc: [email protected]
> > Cc: [email protected]
> > Cc: [email protected]
> > Signed-off-by: Lee Jones <[email protected]>
> > ---
> > drivers/video/fbdev/aty/mach64_ct.c | 19 ++-----------------
> > 1 file changed, 2 insertions(+), 17 deletions(-)
> >
> > diff --git a/drivers/video/fbdev/aty/mach64_ct.c b/drivers/video/fbdev/aty/mach64_ct.c
> > index f87cc81f4fa2b..23eececa1e9d7 100644
> > --- a/drivers/video/fbdev/aty/mach64_ct.c
> > +++ b/drivers/video/fbdev/aty/mach64_ct.c
> > @@ -402,7 +402,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
> > struct atyfb_par *par = (struct atyfb_par *) info->par;
> > u8 mpost_div, xpost_div, sclk_post_div_real;
> > u32 q, memcntl, trp;
> > - u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off;
> > + u32 dsp_config;
> > #ifdef DEBUG
> > int pllmclk, pllsclk;
> > #endif
> > @@ -488,25 +488,10 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)
> >
> > /* Allow BIOS to override */
> > dsp_config = aty_ld_le32(DSP_CONFIG, par);
> > - dsp_on_off = aty_ld_le32(DSP_ON_OFF, par);
> > - vga_dsp_config = aty_ld_le32(VGA_DSP_CONFIG, par);
> > - vga_dsp_on_off = aty_ld_le32(VGA_DSP_ON_OFF, par);
> >
> > if (dsp_config)
> > pll->ct.dsp_loop_latency = (dsp_config & DSP_LOOP_LATENCY) >> 16;
> > -#if 0
> > - FIXME: is it relevant for us?
> > - if ((!dsp_on_off && !M64_HAS(RESET_3D)) ||
> > - ((dsp_on_off == vga_dsp_on_off) &&
> > - (!dsp_config || !((dsp_config ^ vga_dsp_config) & DSP_XCLKS_PER_QW)))) {
> > - vga_dsp_on_off &= VGA_DSP_OFF;
> > - vga_dsp_config &= VGA_DSP_XCLKS_PER_QW;
> > - if (ATIDivide(vga_dsp_on_off, vga_dsp_config, 5, 1) > 24)
> > - pll->ct.fifo_size = 32;
> > - else
> > - pll->ct.fifo_size = 24;
> > - }
> > -#endif
> > +
> > /* Exit if the user does not want us to tamper with the clock
> > rates of her chip. */
> > if (par->mclk_per == 0) {
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Hi Lee,
On Wed, Jan 13, 2021 at 02:49:38PM +0000, Lee Jones wrote:
> This set is part of a larger effort attempting to clean-up W=1
> kernel builds, which are currently overwhelmingly riddled with
> niggly little warnings.
>
> This patch-set clears all of the W=1 warnings currently residing
> in drivers/video.
I am sorry to say that I expect most of your nice patches to clash
with patches that is already present in drm-misc-next.
drivers/video/ are warning free with W=1 in drm-misc-next today.
I do not know why drm-misc-next is not yet pullled into linux-next.
Sam
On 1/13/21, 9:50 AM, Lee Jones wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/video/fbdev/s3c-fb.c:104: warning: Function parameter or member 'osd_stride' not described in 's3c_fb_variant'
> drivers/video/fbdev/s3c-fb.c:174: warning: Function parameter or member 'variant' not described in 's3c_fb_win'
> drivers/video/fbdev/s3c-fb.c:345: warning: Function parameter or member 'pixclk' not described in 's3c_fb_calc_pixclk'
> drivers/video/fbdev/s3c-fb.c:345: warning: Excess function parameter 'pixclock' description in 's3c_fb_calc_pixclk'
> drivers/video/fbdev/s3c-fb.c:742: warning: Function parameter or member 'transp' not described in 's3c_fb_setcolreg'
> drivers/video/fbdev/s3c-fb.c:742: warning: Excess function parameter 'trans' description in 's3c_fb_setcolreg'
> drivers/video/fbdev/s3c-fb.c:1142: warning: Function parameter or member 'sfb' not described in 's3c_fb_release_win'
> drivers/video/fbdev/s3c-fb.c:1172: warning: Function parameter or member 'win_no' not described in 's3c_fb_probe_win'
>
> Cc: Jingoo Han <[email protected]>
Acked-by: Jingoo Han <[email protected]>
Thank you.
> Cc: Ben Dooks <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Lee Jones <[email protected]>
> ---
> drivers/video/fbdev/s3c-fb.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
[...]
On 1/13/21, 9:50 AM, Lee Jones wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/video/fbdev/s3c-fb.c: In function ?s3c_fb_probe_win?:
> drivers/video/fbdev/s3c-fb.c:1176:28: warning: variable ?var? set but not used [-Wunused-but-set-variable]
>
> Cc: Jingoo Han <[email protected]>
Acked-by: Jingoo Han <[email protected]>
Best regards,
Jingoo Han
> Cc: Ben Dooks <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Lee Jones <[email protected]>
> ---
> drivers/video/fbdev/s3c-fb.c | 2 --
> 1 file changed, 2 deletions(-)
[...]
On Wed, 13 Jan 2021, Sam Ravnborg wrote:
> Hi Lee,
>
> On Wed, Jan 13, 2021 at 02:49:38PM +0000, Lee Jones wrote:
> > This set is part of a larger effort attempting to clean-up W=1
> > kernel builds, which are currently overwhelmingly riddled with
> > niggly little warnings.
> >
> > This patch-set clears all of the W=1 warnings currently residing
> > in drivers/video.
>
> I am sorry to say that I expect most of your nice patches to clash
> with patches that is already present in drm-misc-next.
>
> drivers/video/ are warning free with W=1 in drm-misc-next today.
>
> I do not know why drm-misc-next is not yet pullled into linux-next.
Well that kinda sucks. What are the chances of that?
Most of my patches fix issues that have been there for years!
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
On Wed, 13 Jan 2021, Lee Jones <[email protected]> wrote:
> On Wed, 13 Jan 2021, Sam Ravnborg wrote:
>
>> Hi Lee,
>>
>> On Wed, Jan 13, 2021 at 02:49:38PM +0000, Lee Jones wrote:
>> > This set is part of a larger effort attempting to clean-up W=1
>> > kernel builds, which are currently overwhelmingly riddled with
>> > niggly little warnings.
>> >
>> > This patch-set clears all of the W=1 warnings currently residing
>> > in drivers/video.
>>
>> I am sorry to say that I expect most of your nice patches to clash
>> with patches that is already present in drm-misc-next.
>>
>> drivers/video/ are warning free with W=1 in drm-misc-next today.
>>
>> I do not know why drm-misc-next is not yet pullled into linux-next.
>
> Well that kinda sucks. What are the chances of that?
>
> Most of my patches fix issues that have been there for years!
We auto-update the for-linux-next and for-linux-next-fixes branches, and
they seem to be up-to-date [1].
How recent are the fixes, maybe because of this: [2]?
BR,
Jani.
[1] https://cgit.freedesktop.org/drm/drm-misc
[2] http://lore.kernel.org/r/[email protected]
--
Jani Nikula, Intel Open Source Graphics Center
On Thu, Jan 14, 2021 at 10:04 AM Jani Nikula
<[email protected]> wrote:
>
> On Wed, 13 Jan 2021, Lee Jones <[email protected]> wrote:
> > On Wed, 13 Jan 2021, Sam Ravnborg wrote:
> >
> >> Hi Lee,
> >>
> >> On Wed, Jan 13, 2021 at 02:49:38PM +0000, Lee Jones wrote:
> >> > This set is part of a larger effort attempting to clean-up W=1
> >> > kernel builds, which are currently overwhelmingly riddled with
> >> > niggly little warnings.
> >> >
> >> > This patch-set clears all of the W=1 warnings currently residing
> >> > in drivers/video.
> >>
> >> I am sorry to say that I expect most of your nice patches to clash
> >> with patches that is already present in drm-misc-next.
> >>
> >> drivers/video/ are warning free with W=1 in drm-misc-next today.
> >>
> >> I do not know why drm-misc-next is not yet pullled into linux-next.
> >
> > Well that kinda sucks. What are the chances of that?
> >
> > Most of my patches fix issues that have been there for years!
I planned to go through them all today, let's see what's still needed.
> We auto-update the for-linux-next and for-linux-next-fixes branches, and
> they seem to be up-to-date [1].
It only happened last week instead of right after -rc1 due to some
confusion, but it should have been in linux-next for a few days
already.
> How recent are the fixes, maybe because of this: [2]?
>
> BR,
> Jani.
>
>
> [1] https://cgit.freedesktop.org/drm/drm-misc
> [2] http://lore.kernel.org/r/[email protected]
Patch for that just got committted, so this shouldn't be too big a
window for drm-misc-next to be excluded should have been very small.
-Daniel
>
> --
> Jani Nikula, Intel Open Source Graphics Center
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
On Thu, Jan 14, 2021 at 10:11:01AM +0100, Daniel Vetter wrote:
> On Thu, Jan 14, 2021 at 10:04 AM Jani Nikula
> <[email protected]> wrote:
> >
> > On Wed, 13 Jan 2021, Lee Jones <[email protected]> wrote:
> > > On Wed, 13 Jan 2021, Sam Ravnborg wrote:
> > >
> > >> Hi Lee,
> > >>
> > >> On Wed, Jan 13, 2021 at 02:49:38PM +0000, Lee Jones wrote:
> > >> > This set is part of a larger effort attempting to clean-up W=1
> > >> > kernel builds, which are currently overwhelmingly riddled with
> > >> > niggly little warnings.
> > >> >
> > >> > This patch-set clears all of the W=1 warnings currently residing
> > >> > in drivers/video.
> > >>
> > >> I am sorry to say that I expect most of your nice patches to clash
> > >> with patches that is already present in drm-misc-next.
> > >>
> > >> drivers/video/ are warning free with W=1 in drm-misc-next today.
> > >>
> > >> I do not know why drm-misc-next is not yet pullled into linux-next.
> > >
> > > Well that kinda sucks. What are the chances of that?
> > >
> > > Most of my patches fix issues that have been there for years!
>
> I planned to go through them all today, let's see what's still needed.
First bunch of patches are all not needed anymore, I think this is quicker
if you're rebasing. Unfortunate this happened :-/
-Daniel
>
> > We auto-update the for-linux-next and for-linux-next-fixes branches, and
> > they seem to be up-to-date [1].
>
> It only happened last week instead of right after -rc1 due to some
> confusion, but it should have been in linux-next for a few days
> already.
>
> > How recent are the fixes, maybe because of this: [2]?
> >
> > BR,
> > Jani.
> >
> >
> > [1] https://cgit.freedesktop.org/drm/drm-misc
> > [2] http://lore.kernel.org/r/[email protected]
>
> Patch for that just got committted, so this shouldn't be too big a
> window for drm-misc-next to be excluded should have been very small.
> -Daniel
>
> >
> > --
> > Jani Nikula, Intel Open Source Graphics Center
> > _______________________________________________
> > dri-devel mailing list
> > [email protected]
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch