[PATCH v1 0/28] drivers/video: W=1 warning fixes
STALE2152d
SUPERSEDED
Revision v1 of 3 in this series.
34 messages,
4 authors,
2020-11-28 · open the first message on its own page
Following the great work of Lee Jones in other subsystems
here is a set of patches that address all remaining W=1
warnings in drivers/video/.
Lee Jones already fixed all warnings in video/backlight/ so
this is mostly fbdev related fixes.
The general approach used were:
- Fix kernel-doc, this is often very trivial
- Drop unused local variables
- Use no_printk for local logging support
Build tested on a set of architectures with various configs.
The patches do not depends on each other and in most cases all
fixes for one driver is kept in a single patch.
The individual changes are trivial so this is a great
starter task to try to review these patches.
A timely Reviewed-by: or Acked-by: would be very nice so we can
get the warnings fixes before we cut for the merge window.
Sam
Sam Ravnborg (28):
video: Fix W=1 warnings in of_videomode + of_display_timing
video: fbcon: Use pr_debug() in fbcon
video: fbdev: core: Fix W=1 warnings in fbmon + fb_notify
video: fbdev: aty: Delete unused variable in radeon_monitor
video: fbdev: aty: Fix W=1 warnings in atyfb_base
video: fbdev: aty: Fix W=1 warnings in mach64_ct
video: fbdev: sis: Fix W=1 warnings about static symbols
video: fbdev: sis: Fix W=1 warning about SiS_TVDelay
video: fbdev: sis: Fix W=1 warnings in init.c
video: fbdev: sis: Fix W=1 warnings in sis_main
video: fbdev: via: Fix W=1 warnings
video: fbdev: tdfx: Fix W=1 warnings
video: fbdev: riva: Fix W=1 warnings
video: fbdev: pm2fb: Fix W=1 warnings
video: fbdev: neofb: Fix W=1 warnings
video: fbdev: hgafb: Fix W=1 warnings
video: fbdev: tgafb: Fix W=1 warnings
video: fbdev: mx3fb: Fix W=1 warnings
video: fbdev: sstfb: Fix W=1 warnings
video: fbdev: nvidia: Fix W=1 warnings
video: fbdev: tmiofb: Fix W=1 warnings
video: fbdev: omapfb: Fix W=1 warnings in dsi
video: fbdev: omapfb: Fix W=1 warnings in hdmi*_core
video: fbdev: s3c-fb: Fix W=1 warnings
video: fbdev: uvesafb: Fix W=1 warning
video: fbdev: uvesafb: Fix W=1 string related warnings
video: fbdev: cirrusfb: Fix W=1 warnings
video: fbdev: s1d13xxxfb: Fix W=1 warnings
drivers/video/fbdev/aty/atyfb_base.c | 12 ++------
drivers/video/fbdev/aty/mach64_ct.c | 15 ++++++----
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 | 20 ++++---------
drivers/video/fbdev/core/fbmon.c | 2 +-
drivers/video/fbdev/hgafb.c | 4 +--
drivers/video/fbdev/mx3fb.c | 13 +++++----
drivers/video/fbdev/neofb.c | 4 ---
drivers/video/fbdev/nvidia/nv_setup.c | 7 ++---
drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 12 ++------
drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 +--
drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 4 +--
drivers/video/fbdev/pm2fb.c | 8 +++---
drivers/video/fbdev/riva/fbdev.c | 9 +++---
drivers/video/fbdev/riva/riva_hw.c | 28 ++++++-------------
drivers/video/fbdev/s1d13xxxfb.c | 3 +-
drivers/video/fbdev/s3c-fb.c | 11 ++++----
drivers/video/fbdev/sis/init.c | 34 ++++-------------------
drivers/video/fbdev/sis/oem310.h | 2 ++
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/tgafb.c | 7 ++---
drivers/video/fbdev/tmiofb.c | 6 ++--
drivers/video/fbdev/uvesafb.c | 8 +++---
drivers/video/fbdev/via/lcd.c | 4 +--
drivers/video/of_display_timing.c | 1 +
drivers/video/of_videomode.c | 8 +++---
include/video/sstfb.h | 4 +--
32 files changed, 104 insertions(+), 169 deletions(-)
Fix trivial W=1 warnings.
Update kernel-doc to avoid the warnings.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/of_display_timing.c | 1 +
drivers/video/of_videomode.c | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index abc9ada798ee..f93b6abbe258 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 that contains the result . I may be partially written in case of errors
**/
static int of_parse_display_timing ( const struct device_node * np ,
struct display_timing * dt ) diff --git a/drivers/video/of_videomode.c b/drivers/video/of_videomode.c
index 67aff2421c29..a5bb02f02b44 100644
--- a/drivers/video/of_videomode.c
+++ b/drivers/video/of_videomode.c @@ -13,10 +13,10 @@
#include <video/videomode.h>
/**
- * 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
+ * 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 .)
* --
2.27.0
Replacing DPRINTK() statements with pr_debug fixes
W=1 warnings.
And moves to a more standard logging setup at the same time.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Daniel Vetter <redacted>
Cc: Bartlomiej Zolnierkiewicz <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: Peilin Ye <redacted>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: George Kennedy <redacted>
Cc: Nathan Chancellor <redacted>
Cc: Peter Rosin <redacted>
---
drivers/video/fbdev/core/fbcon.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index bf61598bf1c3..2edf90f638f3 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c @@ -56,8 +56,6 @@
* more details .
*/
- #undef FBCONDEBUG
-
#include <linux/module.h>
#include <linux/types.h>
#include <linux/fs.h> @@ -82,12 +80,6 @@
#include "fbcon.h"
- #ifdef FBCONDEBUG
- # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
- #else
- # define DPRINTK(fmt, args...)
- #endif
-
/*
* FIXME : Locking
* @@ -1015,9 +1007,9 @@ static const char *fbcon_startup(void)
rows /= vc -> vc_font . height ;
vc_resize ( vc , cols , rows );
- DPRINTK ( "mode: %s \n " , info -> fix . id );
- DPRINTK ( "visual: %d \n " , info -> fix . visual );
- DPRINTK ( "res: %dx%d-%d \n " , info -> var . xres ,
+ pr_debug ( "mode: %s \n " , info -> fix . id );
+ pr_debug ( "visual: %d \n " , info -> fix . visual );
+ pr_debug ( "res: %dx%d-%d \n " , info -> var . xres ,
info -> var . yres ,
info -> var . bits_per_pixel );
@@ -2013,7 +2005,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
y_diff < 0 || y_diff > virt_fh ) {
const struct fb_videomode * mode ;
- DPRINTK ( "attempting resize %ix%i \n " , var . xres , var . yres );
+ pr_debug ( "attempting resize %ix%i \n " , var . xres , var . yres );
mode = fb_find_best_mode ( & var , & info -> modelist );
if ( mode == NULL )
return - EINVAL ; @@ -2023,7 +2015,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
if ( virt_w > var . xres / virt_fw || virt_h > var . yres / virt_fh )
return - EINVAL ;
- DPRINTK ( "resize now %ix%i \n " , var . xres , var . yres );
+ pr_debug ( "resize now %ix%i \n " , var . xres , var . yres );
if ( con_is_visible ( vc )) {
var . activate = FB_ACTIVATE_NOW |
FB_ACTIVATE_FORCE ; @@ -3299,7 +3291,7 @@ static void fbcon_exit(void)
if ( info -> queue . func )
pending = cancel_work_sync ( & info -> queue );
- DPRINTK ( "fbcon: %s pending work \n " , ( pending ? "canceled" :
+ pr_debug ( "fbcon: %s pending work \n " , ( pending ? "canceled" :
"no" ));
for ( j = first_fb_vc ; j <= last_fb_vc ; j ++ ) { --
2.27.0
Fix W=1 warnings by updating kernel-doc to follow the correct syntax.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Bartlomiej Zolnierkiewicz <redacted>
Cc: Daniel Vetter <redacted>
Cc: "Alexander A. Klimov" <redacted>
---
drivers/video/fbdev/core/fb_notify.c | 3 ++-
drivers/video/fbdev/core/fbmon.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/core/fb_notify.c b/drivers/video/fbdev/core/fb_notify.c
index 74c2da528884..d85717b6e14a 100644
--- a/drivers/video/fbdev/core/fb_notify.c
+++ b/drivers/video/fbdev/core/fb_notify.c @@ -38,7 +38,8 @@ EXPORT_SYMBOL(fb_unregister_client);
/**
* fb_notifier_call_chain - notify clients of fb_events
- *
+ * @ val : value passed to callback
+ * @ v : pointer passed to callback
*/
int fb_notifier_call_chain ( unsigned long val , void * v )
{ diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 1bf82dbc9e3c..b0e690f41025 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 : monitor specifications , may be NULL
*
* 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.27.0
Fix W=1 about variable that is asssigned a value but never used.
The variable was indeed never used so delete it.
Keep the call to radeon_probe_i2c_connector() as it may have
side-effects. It is unlikely but I could not verify that is was safe to
drop the call.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-fbdev@vger.kernel.org
---
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 9966c58aa26c..df55e23b7a5a 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.27.0
Fix W=1 warnings about variables assigned but never used.
- Drop variables that was never used
- Avoid using a local variable by moving the expression to an if
condition
Signed-off-by: Sam Ravnborg <redacted>
Cc: Bartlomiej Zolnierkiewicz <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Daniel Vetter <redacted>
Cc: Joe Perches <joe@perches.com>
Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Jani Nikula <redacted>
---
drivers/video/fbdev/aty/atyfb_base.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index c8feff0ee8da..d1eb9218debb 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -2360,22 +2360,20 @@ 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 dac_subtype , clk_type ;
stat0 = aty_ld_le32 ( CNFG_STAT0 , par );
par -> bus_type = ( stat0 >> 0 ) & 0x07 ;
par -> ram_type = ( stat0 >> 3 ) & 0x07 ;
ramname = aty_gx_ram [ par -> ram_type ];
/* FIXME: clockchip/RAMDAC probing? */
- dac_type = ( aty_ld_le32 ( DAC_CNTL , par ) >> 16 ) & 0x07 ;
+ aty_ld_le32 ( DAC_CNTL , par );
#ifdef CONFIG_ATARI
clk_type = CLK_ATI18818_1 ;
- dac_type = ( stat0 >> 9 ) & 0x07 ;
- if ( dac_type == 0x07 )
+ if ((( stat0 >> 9 ) & 0x07 ) == 0x07 )
dac_subtype = DAC_ATT20C408 ;
else
dac_subtype = ( aty_ld_8 ( SCRATCH_REG1 + 1 , par ) & 0xF0 ) | dac_type ;
#else
- dac_type = DAC_IBMRGB514 ;
dac_subtype = DAC_IBMRGB514 ;
clk_type = CLK_IBMRGB514 ;
#endif @@ -3062,7 +3060,6 @@ static int atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info,
if ( dp == of_console_device ) {
struct fb_var_screeninfo * var = & default_var ;
unsigned int N , P , Q , M , T , R ;
- u32 v_total , h_total ;
struct crtc crtc ;
u8 pll_regs [ 16 ];
u8 clock_cntl ; @@ -3078,9 +3075,6 @@ static int atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info,
crtc . gen_cntl = aty_ld_le32 ( CRTC_GEN_CNTL , par );
aty_crtc_to_var ( & crtc , var );
- h_total = var -> xres + var -> right_margin + var -> hsync_len + var -> left_margin ;
- v_total = var -> yres + var -> lower_margin + var -> vsync_len + var -> upper_margin ;
-
/*
* Read the PLL to figure actual Refresh Rate .
*/ --
2.27.0
Fix W=1 about variables assigned but never used.
- One variable is only used when CONFIG_FB_ATY_GENERIC_LCD is defined
Fix so variable is only defined with CONFIG_FB_ATY_GENERIC_LCD
- Several variables was only assigned by a call to aty_ld_le32().
Drop the variables but keep the call to aty_ld_le32() as it may
have unexpected side-effects.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
---
drivers/video/fbdev/aty/mach64_ct.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/aty/mach64_ct.c b/drivers/video/fbdev/aty/mach64_ct.c
index f87cc81f4fa2..011b07e44e0d 100644
--- a/drivers/video/fbdev/aty/mach64_ct.c
+++ b/drivers/video/fbdev/aty/mach64_ct.c @@ -281,10 +281,13 @@ static u32 aty_pll_to_var_ct(const struct fb_info *info, const union aty_pll *pl
void aty_set_pll_ct ( const struct fb_info * info , const union aty_pll * pll )
{
struct atyfb_par * par = ( struct atyfb_par * ) info -> par ;
- u32 crtc_gen_cntl , lcd_gen_cntrl ;
+ u32 crtc_gen_cntl ;
u8 tmp , tmp2 ;
- lcd_gen_cntrl = 0 ;
+ #ifdef CONFIG_FB_ATY_GENERIC_LCD
+ u32 lcd_gen_cntrl = 0 ;
+ #endif
+
#ifdef DEBUG
printk ( "atyfb(%s): about to program: \n "
"pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x \n " , @@ -402,7 +405,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,9 +491,9 @@ 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 );
+ aty_ld_le32 ( DSP_ON_OFF , par );
+ aty_ld_le32 ( VGA_DSP_CONFIG , par );
+ aty_ld_le32 ( VGA_DSP_ON_OFF , par );
if ( dsp_config )
pll -> ct . dsp_loop_latency = ( dsp_config & DSP_LOOP_LATENCY ) >> 16 ; --
2.27.0
Fix W=1 warning by dropping unused variable
Signed-off-by: Sam Ravnborg <redacted>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
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 03c736f6f3d0..266a5582f94d 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.27.0
Fix several W=1 warnings.
This removes a lot of unused code - which is always a good thing to do.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
drivers/video/fbdev/sis/init.c | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c
index fde27feae5d0..b77ea1a8825a 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,17 +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 , HBS , HDE , HT ;
- unsigned short VRE , VBE , VRS , VBS , VDE , VT ;
- unsigned char sr_data , cr_data , cr_data2 ;
- int A , B , C , D , E , F , temp ;
+ 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 );
- A = HT + 5 ;
-
/* Horizontal display enable end */
HDE = crdata [ 1 ] | (( unsigned short )( sr_data & 0x0C ) << 6 );
E = HDE + 1 ; @@ -3557,9 +3553,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 ];
@@ -3588,13 +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 );
- A = VT + 2 ;
-
/* Vertical display enable end */
VDE = crdata [ 10 ] |
(( unsigned short )( cr_data & 0x02 ) << 7 ) | @@ -3609,14 +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 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.27.0
init.h define static symbols, so should only be included
once. Drop the include from sis.h as it is not needed.
This fixes a lot of warnings seen with a W=1 build.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
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 9f4c3093ccb3..d632f096083b 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.27.0
Fix W=1 warning about unused assignment.
Fix by dropping the local variable.
Signed-off-by: Sam Ravnborg <redacted>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Sam Ravnborg <redacted>
Cc: Jani Nikula <redacted>
Cc: Daniel Vetter <redacted>
Cc: Arnd Bergmann <arnd@arndb.de>
---
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 f056d80f6359..67e37a62b07c 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.27.0
Fix W=1 warning by commenting unused SiS_TVDelay* variables.
The SiS_TVDelay* variables seem to contain some magic numbers
so looks like data worth keeping around but not as code we build.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
drivers/video/fbdev/sis/oem310.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/video/fbdev/sis/oem310.h b/drivers/video/fbdev/sis/oem310.h
index 8fce56e4482c..ed28755715ce 100644
--- a/drivers/video/fbdev/sis/oem310.h
+++ b/drivers/video/fbdev/sis/oem310.h @@ -200,6 +200,7 @@ static const unsigned char SiS310_TVDelayCompensation_651302LV[] = /* M650, 651,
0x33 , 0x33
};
+ #if 0 /* Not used */
static const unsigned char SiS_TVDelay661_301 [] = /* 661, 301 */
{
0x44 , 0x44 , @@ -219,6 +220,7 @@ static const unsigned char SiS_TVDelay661_301B[] = /* 661, 301B et al */
0x44 , 0x44 ,
0x44 , 0x44
};
+ #endif
static const unsigned char SiS310_TVDelayCompensation_LVDS [] = /* LVDS */
{ --
2.27.0
Fix W=1 warnings about unused assignment.
Fixed by dropping the assignment and deleting the local variable.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-fbdev@vger.kernel.org
---
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 4a869402d120..088b962076b5 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.27.0
Fix kernel-doc comments.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Ferenc Bakonyi <redacted>
Cc: linux-nvidia@lists.surfsouth.com
---
drivers/video/fbdev/hgafb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/hgafb.c b/drivers/video/fbdev/hgafb.c
index a45fcff1461f..69af72937844 100644
--- a/drivers/video/fbdev/hgafb.c
+++ b/drivers/video/fbdev/hgafb.c @@ -358,7 +358,7 @@ static int hga_card_detect(void)
/**
* hgafb_open - open the framebuffer device
* @ info : pointer to fb_info object containing info for current hga board
- * @ int : open by console system or userland .
+ * @ init : open by console system or userland .
*/
static int hgafb_open ( struct fb_info * info , int init ) @@ -372,7 +372,7 @@ static int hgafb_open(struct fb_info *info, int init)
/**
* hgafb_open - open the framebuffer device
* @ info : pointer to fb_info object containing info for current hga board
- * @ int : open by console system or userland .
+ * @ init : open by console system or userland .
*/
static int hgafb_release ( struct fb_info * info , int init ) --
2.27.0
Fix W=1 warnings:
- Fix kernel-doc
- Drop unused variables/code
Signed-off-by: Sam Ravnborg <redacted>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/fbdev/riva/fbdev.c | 9 ++++-----
drivers/video/fbdev/riva/riva_hw.c | 28 ++++++++--------------------
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c
index ce55b9d2e862..55554b0433cb 100644
--- a/drivers/video/fbdev/riva/fbdev.c
+++ b/drivers/video/fbdev/riva/fbdev.c @@ -464,7 +464,7 @@ 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 @@ -843,9 +843,9 @@ static void riva_update_var(struct fb_var_screeninfo *var,
/**
* rivafb_do_maximize -
* @ info : pointer to fb_info object containing info for current riva board
- * @ var :
- * @ nom :
- * @ den :
+ * @ var : standard kernel fb changeable data
+ * @ nom : nom
+ * @ den : den
*
* DESCRIPTION :
* . @@ -1214,7 +1214,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 : diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c
index bcf9c4b4de31..8b829b720064 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 vus_m , vus_n , vus_p ;
- int vpm_us , us_video , vlwm , cpm_us , us_crt , clwm ;
+ int us_m , us_m_min , us_n , us_p , crtc_drain_rate ;
+ int vus_m ;
+ 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,11 @@ 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 +984,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 +1000,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,7 +1027,6 @@ static void nv10CalcArbitration
min_mclk_extra -- ;
}
}
- craw = clwm ;
if ( clwm < ( 1024 - cbs + 8 )) clwm = 1024 - cbs + 8 ;
data = ( int )( clwm ); --
2.27.0
Fix W=1 warnings:
- Fix kernel-doc
- Drop unused code/variables
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Jani Nikula <redacted>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Daniel Vetter <redacted>
Cc: Xiaofei Tan <redacted>
Cc: Arnd Bergmann <arnd@arndb.de>
---
drivers/video/fbdev/mx3fb.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index 894617ddabcb..fabb271337ed 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 );
@@ -732,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 ) @@ -740,7 +739,7 @@ static int mx3fb_set_fix(struct fb_info *fbi)
struct fb_fix_screeninfo * fix = & fbi -> fix ;
struct fb_var_screeninfo * var = & fbi -> var ;
- strncpy ( fix -> id , "DISP3 BG" , 8 );
+ memcpy ( fix -> id , "DISP3 BG" , 8 );
fix -> line_length = var -> xres_virtual * var -> bits_per_pixel / 8 ;
@@ -1105,6 +1104,8 @@ static void __blank(int blank, struct fb_info *fbi)
/**
* mx3fb_blank () - blank the display .
+ * @ blank : blank value for the panel
+ * @ fbi : framebuffer information pointer
*/
static int mx3fb_blank ( int blank , struct fb_info * fbi )
{ @@ -1126,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
*/ @@ -1387,6 +1388,8 @@ static int mx3fb_unmap_video_memory(struct fb_info *fbi)
/**
* mx3fb_init_fbinfo () - initialize framebuffer information object .
+ * @ dev : the device
+ * @ ops : framebuffer device operations
* @ return : initialized framebuffer structure .
*/
static struct fb_info * mx3fb_init_fbinfo ( struct device * dev , --
2.27.0
Fix W=1 warnigns by removing unused code
Signed-off-by: Sam Ravnborg <redacted>
Cc: Bartlomiej Zolnierkiewicz <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Evgeny Novikov <redacted>
Cc: Jani Nikula <redacted>
Cc: Mike Rapoport <rppt@kernel.org>
---
drivers/video/fbdev/neofb.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c
index 09a20d4ab35f..c0f4f402da3f 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,19 +1894,16 @@ 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 ; --
2.27.0
Fix warnings by deleting unused code
Signed-off-by: Sam Ravnborg <redacted>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/fbdev/nvidia/nv_setup.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/nvidia/nv_setup.c b/drivers/video/fbdev/nvidia/nv_setup.c
index 2fa68669613a..5404017e6957 100644
--- a/drivers/video/fbdev/nvidia/nv_setup.c
+++ b/drivers/video/fbdev/nvidia/nv_setup.c @@ -89,9 +89,8 @@ 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 +100,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.27.0
Fix W=1 warnings by introducing no_printk variants for the
internal logging system for this driver.
Fix a new warning that popped up now that logging was checked for
correct printf format strings.
A more invasive fix had been to replace all the internal logging with
standard logging primitives - thats for another day.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Daniel Vetter <redacted>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bartlomiej Zolnierkiewicz <redacted>
Cc: Alex Dewar <redacted>
Cc: Jani Nikula <redacted>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/fbdev/sstfb.c | 2 +-
include/video/sstfb.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/sstfb.c b/drivers/video/fbdev/sstfb.c
index c05cdabeb11c..27d4b0ace2d6 100644
--- a/drivers/video/fbdev/sstfb.c
+++ b/drivers/video/fbdev/sstfb.c @@ -1390,7 +1390,7 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
fix -> smem_start , info -> screen_base ,
fix -> smem_len >> 20 );
- f_ddprintk ( "regbase_virt: %#lx \n " , par -> mmio_vbase );
+ f_ddprintk ( "regbase_virt: %p \n " , par -> mmio_vbase );
f_ddprintk ( "membase_phys: %#lx \n " , fix -> smem_start );
f_ddprintk ( "fbbase_virt: %p \n " , info -> screen_base );
diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index 28384f354773..d4a5e41d1173 100644
--- a/include/video/sstfb.h
+++ b/include/video/sstfb.h @@ -23,7 +23,7 @@
# define SST_DEBUG_FUNC 1
# define SST_DEBUG_VAR 1
#else
- # define dprintk(X...)
+ # define dprintk(X...) no_printk(X)
# define SST_DEBUG_REG 0
# define SST_DEBUG_FUNC 0
# define SST_DEBUG_VAR 0 @@ -48,7 +48,7 @@
#if (SST_DEBUG_FUNC > 1)
# define f_ddprintk(X...) dprintk(" " X)
#else
- # define f_ddprintk(X...)
+ # define f_ddprintk(X...) no_printk(X)
#endif
#if (SST_DEBUG_FUNC > 2)
# define f_dddprintk(X...) dprintk(" " X) --
2.27.0
Fix W=1 warnings:
- Fix kernel-doc
- Drop unused code
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Jani Nikula <redacted>
Cc: Bartlomiej Zolnierkiewicz <redacted>
Cc: Daniel Vetter <redacted>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Joe Perches <joe@perches.com>
---
drivers/video/fbdev/tgafb.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
index 666fbe2f671c..ae0cf5540636 100644
--- a/drivers/video/fbdev/tgafb.c
+++ b/drivers/video/fbdev/tgafb.c @@ -555,7 +555,7 @@ tgafb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
/**
* tgafb_blank - Optional function . Blanks the display .
- * @ blank_mode : the blank mode we want .
+ * @ blank : the blank mode we want .
* @ info : frame buffer structure that represents a single frame buffer
*/
static int @@ -837,7 +837,7 @@ tgafb_clut_imageblit(struct fb_info *info, const struct fb_image *image)
u32 * palette = (( u32 * ) info -> pseudo_palette );
unsigned long pos , line_length , i , j ;
const unsigned char * data ;
- void __iomem * regs_base , * fb_base ;
+ void __iomem * fb_base ;
dx = image -> dx ;
dy = image -> dy ; @@ -855,7 +855,6 @@ tgafb_clut_imageblit(struct fb_info *info, const struct fb_image *image)
if ( dy + height > vyres )
height = vyres - dy ;
- regs_base = par -> tga_regs_base ;
fb_base = par -> tga_fb_base ;
pos = dy * line_length + ( dx * 4 ); @@ -1034,7 +1033,7 @@ tgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
regs_base + TGA_MODE_REG );
}
- /**
+ /*
* tgafb_copyarea - REQUIRED function . Can use generic routines if
* non acclerated hardware and packed pixel based .
* Copies on area of the screen to another area . --
2.27.0
Two W=1 string related warnings.
- Using strncpy to copy string wihtout null-termination is not good.
Use memcpy to copy only the relevant chars
- Fix a potential bug with a very long string, subtract one from the
length to make room for the termination null.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Michal Januszewski <spock@gentoo.org>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/fbdev/uvesafb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index 8ee0fc9c63cf..45dc8da191e4 100644
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c @@ -423,7 +423,7 @@ static int uvesafb_vbe_getinfo(struct uvesafb_ktask *task,
task -> t . flags = TF_VBEIB ;
task -> t . buf_len = sizeof ( struct vbe_ib );
task -> buf = & par -> vbe_ib ;
- strncpy ( par -> vbe_ib . vbe_signature , "VBE2" , 4 );
+ memcpy ( par -> vbe_ib . vbe_signature , "VBE2" , 4 );
err = uvesafb_exec ( task );
if ( err || ( task -> t . regs . eax & 0xffff ) != 0x004f ) { @@ -1871,7 +1871,7 @@ static ssize_t v86d_show(struct device_driver *dev, char *buf)
static ssize_t v86d_store ( struct device_driver * dev , const char * buf ,
size_t count )
{
- strncpy ( v86d_path , buf , PATH_MAX );
+ strncpy ( v86d_path , buf , PATH_MAX - 1 );
return count ;
}
static DRIVER_ATTR_RW ( v86d ); --
2.27.0
Fixed a few kernel-doc issues to fix the warnings.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bartlomiej Zolnierkiewicz <redacted>
Cc: Jani Nikula <redacted>
---
drivers/video/fbdev/pm2fb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c
index 27893fa139b0..c68725eebee3 100644
--- a/drivers/video/fbdev/pm2fb.c
+++ b/drivers/video/fbdev/pm2fb.c @@ -1508,8 +1508,8 @@ static const struct fb_ops pm2fb_ops = {
*
* 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 )
{ @@ -1715,7 +1715,7 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
*
* 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.27.0
Fix a few W=1 warnings about unused assignments.
Drop the unused error code.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Qilong Zhang <redacted>
Cc: "Alexander A. Klimov" <redacted>
Cc: Daniel Vetter <redacted>
---
drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 4 ++--
drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
index 726c190862d4..e6363a420933 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c @@ -679,7 +679,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
struct hdmi_audio_format audio_format ;
struct hdmi_audio_dma audio_dma ;
struct hdmi_core_audio_config acore ;
- int err , n , cts , channel_count ;
+ int n , cts , channel_count ;
unsigned int fs_nr ;
bool word_length_16b = false ;
@@ -741,7 +741,7 @@ int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
return - EINVAL ;
}
- err = hdmi_compute_acr ( pclk , fs_nr , & n , & cts );
+ hdmi_compute_acr ( pclk , fs_nr , & n , & cts );
/* Audio clock regeneration settings */
acore . n = n ; diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
index eda29d3032e1..cb63bc0e92ca 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c @@ -790,7 +790,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
struct hdmi_audio_format audio_format ;
struct hdmi_audio_dma audio_dma ;
struct hdmi_core_audio_config core_cfg ;
- int err , n , cts , channel_count ;
+ int n , cts , channel_count ;
unsigned int fs_nr ;
bool word_length_16b = false ;
@@ -833,7 +833,7 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
return - EINVAL ;
}
- err = hdmi_compute_acr ( pclk , fs_nr , & n , & cts );
+ hdmi_compute_acr ( pclk , fs_nr , & n , & cts );
core_cfg . n = n ;
core_cfg . cts = cts ;
--
2.27.0
Fix W=1 warning by deleting unused local variable.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Michal Januszewski <spock@gentoo.org>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/fbdev/uvesafb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index def14ac0ebe1..8ee0fc9c63cf 100644
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c @@ -554,12 +554,12 @@ static int uvesafb_vbe_getmodes(struct uvesafb_ktask *task,
static int uvesafb_vbe_getpmi ( struct uvesafb_ktask * task ,
struct uvesafb_par * par )
{
- int i , err ;
+ int i ;
uvesafb_reset ( task );
task -> t . regs . eax = 0x4f0a ;
task -> t . regs . ebx = 0x0 ;
- err = uvesafb_exec ( task );
+ uvesafb_exec ( task );
if (( task -> t . regs . eax & 0xffff ) != 0x4f || task -> t . regs . es < 0xc000 ) {
par -> pmi_setpal = par -> ypan = 0 ; --
2.27.0
Fix several W=1 warnings
- Updated kernel-doc as needed
- Deleted unused local variable, it was assigned but never used
Signed-off-by: Sam Ravnborg <redacted>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/fbdev/s3c-fb.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index ba316bd56efd..3b134e1bbc38 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 : stride of osd
* @ 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 window number
* @ variant : The variant information for this window .
* @ res : Pointer to where to place the resultant window .
* @@ -1170,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 ; @@ -1198,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.27.0
Fix warnings:
- fix kernel-doc
- delete unused code
Signed-off-by: Sam Ravnborg <redacted>
Cc: Thomas Zimemrmann <tzimmermann@suse.de>
Cc: Sam Ravnborg <redacted>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Daniel Vetter <redacted>
Cc: Saeed Mirzamohammadi <redacted>
Cc: Jani Nikula <redacted>
Cc: Mike Rapoport <rppt@kernel.org>
---
drivers/video/fbdev/cirrusfb.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c
index e9027172c0f5..93802abbbc72 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 */ @@ -2800,9 +2798,9 @@ static void bestclock(long freq, int *nom, int *den, int *div)
#ifdef CIRRUSFB_DEBUG
- /**
+ /*
* cirrusfb_dbg_print_regs
- * @ base : If using newmmio , the newmmio base address , otherwise % NULL
+ * @ regbase : If using newmmio , the newmmio base address , otherwise % NULL
* @ reg_class : type of registers to read : % CRT , or % SEQ
*
* DESCRIPTION : @@ -2847,7 +2845,7 @@ static void cirrusfb_dbg_print_regs(struct fb_info *info,
va_end ( list );
}
- /**
+ /*
* cirrusfb_dbg_reg_dump
* @ base : If using newmmio , the newmmio base address , otherwise % NULL
* --
2.27.0
Fix following W=1 warnings:
- Fix unused variables for variables used only for logging.
Fixed by introducing no_printk() to trick compiler to think variables
are used
- Fix kernel-doc warning by deleting an empty comment line
Signed-off-by: Sam Ravnborg <redacted>
Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
---
drivers/video/fbdev/s1d13xxxfb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
index 4541afcf9386..d1b5f965bc96 100644
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c @@ -45,7 +45,7 @@
#if 0
#define dbg(fmt, args...) do { printk(KERN_INFO fmt, ## args); } while(0)
#else
- #define dbg(fmt, args...) do { } while (0)
+ #define dbg(fmt, args...) do { no_printk(KERN_INFO fmt, ## args); } while (0)
#endif
/* @@ -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.27.0
Fix several W=1 warnings.
This removes a little unused code and avoids an assignment by moving
the use inside the conditional block.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Aditya Pakki <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Bartlomiej Zolnierkiewicz <redacted>
---
drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index 6f9c25fec994..72d45a02c3ac 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c @@ -1178,13 +1178,12 @@ static int dsi_regulator_init(struct platform_device *dsidev)
static void _dsi_print_reset_status ( struct platform_device * dsidev )
{
- u32 l ;
int b0 , b1 , b2 ;
/* A dummy read using the SCP interface to any DSIPHY register is
* required after DSIPHY reset to complete the reset of the DSI complex
* I / O . */
- l = dsi_read_reg ( dsidev , DSI_DSIPHY_CFG5 );
+ dsi_read_reg ( dsidev , DSI_DSIPHY_CFG5 );
if ( dss_has_feature ( FEAT_DSI_REVERSE_TXCLKESC )) {
b0 = 28 ; @@ -3627,7 +3626,7 @@ static int dsi_proto_config(struct platform_device *dsidev)
static void dsi_proto_timings ( struct platform_device * dsidev )
{
struct dsi_data * dsi = dsi_get_dsidrv_data ( dsidev );
- unsigned tlpx , tclk_zero , tclk_prepare , tclk_trail ;
+ unsigned tlpx , tclk_zero , tclk_prepare ;
unsigned tclk_pre , tclk_post ;
unsigned ths_prepare , ths_prepare_ths_zero , ths_zero ;
unsigned ths_trail , ths_exit ; @@ -3646,7 +3645,6 @@ static void dsi_proto_timings(struct platform_device *dsidev)
r = dsi_read_reg ( dsidev , DSI_DSIPHY_CFG1 );
tlpx = FLD_GET ( r , 20 , 16 ) * 2 ;
- tclk_trail = FLD_GET ( r , 15 , 8 );
tclk_zero = FLD_GET ( r , 7 , 0 );
r = dsi_read_reg ( dsidev , DSI_DSIPHY_CFG2 ); @@ -4040,7 +4038,6 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel,
{
struct platform_device * dsidev = dsi_get_dsidev_from_dssdev ( dssdev );
struct dsi_data * dsi = dsi_get_dsidrv_data ( dsidev );
- u16 dw , dh ;
dsi_perf_mark_setup ( dsidev );
@@ -4049,11 +4046,8 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel,
dsi -> framedone_callback = callback ;
dsi -> framedone_data = data ;
- dw = dsi -> timings . x_res ;
- dh = dsi -> timings . y_res ;
-
#ifdef DSI_PERF_MEASURE
- dsi -> update_bytes = dw * dh *
+ dsi -> update_bytes = dsi -> timings . x_res * dsi -> timings . y_res *
dsi_get_pixel_size ( dsi -> pix_fmt ) / 8 ;
#endif
dsi_update_screen_dispc ( dsidev ); --
2.27.0
Fix W=1 warnings by avoiding local variables and use direct references.
Signed-off-by: Sam Ravnborg <redacted>
Cc: Daniel Vetter <redacted>
Cc: Sam Ravnborg <redacted>
Cc: Jani Nikula <redacted>
---
drivers/video/fbdev/tmiofb.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/tmiofb.c b/drivers/video/fbdev/tmiofb.c
index 50111966c981..b70faa3850f2 100644
--- a/drivers/video/fbdev/tmiofb.c
+++ b/drivers/video/fbdev/tmiofb.c @@ -802,10 +802,8 @@ static int tmiofb_remove(struct platform_device *dev)
const struct mfd_cell * cell = mfd_get_cell ( dev );
struct fb_info * info = platform_get_drvdata ( dev );
int irq = platform_get_irq ( dev , 0 );
- struct tmiofb_par * par ;
if ( info ) {
- par = info -> par ;
unregister_framebuffer ( info );
tmiofb_hw_stop ( dev ); @@ -816,8 +814,8 @@ static int tmiofb_remove(struct platform_device *dev)
free_irq ( irq , info );
iounmap ( info -> screen_base );
- iounmap ( par -> lcr );
- iounmap ( par -> ccr );
+ iounmap ((( struct tmiofb_par * ) info -> par ) -> lcr );
+ iounmap ((( struct tmiofb_par * ) info -> par ) -> ccr );
framebuffer_release ( info );
} --
2.27.0
On Fri, 2020-11-27 at 20:57 +0100, Sam Ravnborg wrote: Replacing DPRINTK() statements with pr_debug fixes
W=1 warnings.
And moves to a more standard logging setup at the same time. [] quoted hunk diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c [] quoted hunk @@ -1015,9 +1007,9 @@ static const char *fbcon_startup(void) rows /= vc->vc_font.height;
vc_resize(vc, cols, rows);
- DPRINTK("mode: %s\n", info->fix.id);
- DPRINTK("visual: %d\n", info->fix.visual);
- DPRINTK("res: %dx%d-%d\n", info->var.xres,
+ pr_debug("mode: %s\n", info->fix.id);
+ pr_debug("visual: %d\n", info->fix.visual);
+ pr_debug("res: %dx%d-%d\n", info->var.xres,
info->var.yres,
info->var.bits_per_pixel);
It'd be nicer to reindent the subsequent lines too.
quoted hunk @@ -3299,7 +3291,7 @@ static void fbcon_exit(void)
if (info->queue.func)
pending = cancel_work_sync(&info->queue);
- DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" :
+ pr_debug("fbcon: %s pending work\n", (pending ? "canceled" :
"no"));
perhaps:
pr_debug("fbcon: %s pending work\n", pending ? "canceled" : "no");
Hi Joe.
On Fri, Nov 27, 2020 at 01:16:41PM -0800, Joe Perches wrote: On Fri, 2020-11-27 at 20:57 +0100, Sam Ravnborg wrote: quoted Replacing DPRINTK() statements with pr_debug fixes
W=1 warnings.
And moves to a more standard logging setup at the same time. [] quoted diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c [] quoted @@ -1015,9 +1007,9 @@ static const char *fbcon_startup(void) rows /= vc->vc_font.height;
vc_resize(vc, cols, rows);
- DPRINTK("mode: %s\n", info->fix.id);
- DPRINTK("visual: %d\n", info->fix.visual);
- DPRINTK("res: %dx%d-%d\n", info->var.xres,
+ pr_debug("mode: %s\n", info->fix.id);
+ pr_debug("visual: %d\n", info->fix.visual);
+ pr_debug("res: %dx%d-%d\n", info->var.xres,
info->var.yres,
info->var.bits_per_pixel);
It'd be nicer to reindent the subsequent lines too.
quoted @@ -3299,7 +3291,7 @@ static void fbcon_exit(void)
if (info->queue.func)
pending = cancel_work_sync(&info->queue);
- DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" :
+ pr_debug("fbcon: %s pending work\n", (pending ? "canceled" :
"no"));
perhaps:
pr_debug("fbcon: %s pending work\n", pending ? "canceled" : "no"); Good suggestions, I will update accordingly in v2 or when applying in
case someone acks/r-b's the patches.
Sam
Hi Sam,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20201127]
[also build test ERROR on v5.10-rc5]
[cannot apply to tegra-drm/drm/tegra/for-next soc/for-next linus/master drm/drm-next v5.10-rc5 v5.10-rc4 v5.10-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch ]
url: https://github.com/0day-ci/linux/commits/Sam-Ravnborg/drivers-video-W-1-warning-fixes/20201128-040131
base: 6174f05255e65622ff3340257879a4c0f858b0df
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/5a1d55cc719a775ae6c8e96aab317cff47068071
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sam-Ravnborg/drivers-video-W-1-warning-fixes/20201128-040131
git checkout 5a1d55cc719a775ae6c8e96aab317cff47068071
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <redacted>
All errors (new ones prefixed by >>):
In file included from include/linux/timex.h:61,
from include/linux/time32.h:13,
from include/linux/time.h:60,
from include/linux/compat.h:10,
from drivers/video/fbdev/aty/atyfb_base.c:51:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:174:49: warning: ordered comparison of pointer with null pointer [-Wextra]
174 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:137:2: note: in expansion of macro 'BUG_ON'
137 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:137:10: note: in expansion of macro 'virt_addr_valid'
137 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
drivers/video/fbdev/aty/atyfb_base.c: In function 'aty_init': quoted drivers/video/fbdev/aty/atyfb_base.c:2375:61: error: 'dac_type' undeclared (first use in this function) 2375 | dac_subtype = (aty_ld_8(SCRATCH_REG1 + 1, par) & 0xF0) | dac_type;
| ^~~~~~~~
drivers/video/fbdev/aty/atyfb_base.c:2375:61: note: each undeclared identifier is reported only once for each function it appears in
vim +/dac_type +2375 drivers/video/fbdev/aty/atyfb_base.c
1013d26663199f8 drivers/video/aty/atyfb_base.c Antonino A. Daplas 2005-11-07 2348
48c68c4f1b54244 drivers/video/aty/atyfb_base.c Greg Kroah-Hartman 2012-12-21 2349 static int aty_init(struct fb_info *info)
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2350 {
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2351 struct atyfb_par *par = (struct atyfb_par *) info->par;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2352 const char *ramname = NULL, *xtal;
1013d26663199f8 drivers/video/aty/atyfb_base.c Antonino A. Daplas 2005-11-07 2353 int gtb_memsize, has_var = 0;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2354 struct fb_var_screeninfo var;
89c69d2b8eb3ee2 drivers/video/aty/atyfb_base.c Ville Syrjala 2008-07-23 2355 int ret;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2356
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2357 init_waitqueue_head(&par->vblank.wait);
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2358 spin_lock_init(&par->int_lock);
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2359
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2360 #ifdef CONFIG_FB_ATY_GX
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2361 if (!M64_HAS(INTEGRATED)) {
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2362 u32 stat0;
5a1d55cc719a775 drivers/video/fbdev/aty/atyfb_base.c Sam Ravnborg 2020-11-27 2363 u8 dac_subtype, clk_type;
fe86175bce50bc3 drivers/video/aty/atyfb_base.c Randy Dunlap 2009-02-04 2364 stat0 = aty_ld_le32(CNFG_STAT0, par);
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2365 par->bus_type = (stat0 >> 0) & 0x07;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2366 par->ram_type = (stat0 >> 3) & 0x07;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2367 ramname = aty_gx_ram[par->ram_type];
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2368 /* FIXME: clockchip/RAMDAC probing? */
5a1d55cc719a775 drivers/video/fbdev/aty/atyfb_base.c Sam Ravnborg 2020-11-27 2369 aty_ld_le32(DAC_CNTL, par);
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2370 #ifdef CONFIG_ATARI
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2371 clk_type = CLK_ATI18818_1;
5a1d55cc719a775 drivers/video/fbdev/aty/atyfb_base.c Sam Ravnborg 2020-11-27 2372 if (((stat0 >> 9) & 0x07) == 0x07)
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2373 dac_subtype = DAC_ATT20C408;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2374 else
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 @2375 dac_subtype = (aty_ld_8(SCRATCH_REG1 + 1, par) & 0xF0) | dac_type;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2376 #else
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2377 dac_subtype = DAC_IBMRGB514;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2378 clk_type = CLK_IBMRGB514;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2379 #endif
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2380 switch (dac_subtype) {
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2381 case DAC_IBMRGB514:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2382 par->dac_ops = &aty_dac_ibm514;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2383 break;
3a2842480bbef42 drivers/video/aty/atyfb_base.c Antonino A. Daplas 2007-05-08 2384 #ifdef CONFIG_ATARI
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2385 case DAC_ATI68860_B:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2386 case DAC_ATI68860_C:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2387 par->dac_ops = &aty_dac_ati68860b;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2388 break;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2389 case DAC_ATT20C408:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2390 case DAC_ATT21C498:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2391 par->dac_ops = &aty_dac_att21c498;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2392 break;
3a2842480bbef42 drivers/video/aty/atyfb_base.c Antonino A. Daplas 2007-05-08 2393 #endif
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2394 default:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2395 PRINTKI("aty_init: DAC type not implemented yet!\n");
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2396 par->dac_ops = &aty_dac_unsupported;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2397 break;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2398 }
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2399 switch (clk_type) {
0fa67f84f445e8c drivers/video/aty/atyfb_base.c Antonino A. Daplas 2006-06-26 2400 #ifdef CONFIG_ATARI
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2401 case CLK_ATI18818_1:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2402 par->pll_ops = &aty_pll_ati18818_1;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2403 break;
0fa67f84f445e8c drivers/video/aty/atyfb_base.c Antonino A. Daplas 2006-06-26 2404 #else
eba87e8e8d7024d drivers/video/aty/atyfb_base.c Antonino A. Daplas 2006-03-27 2405 case CLK_IBMRGB514:
eba87e8e8d7024d drivers/video/aty/atyfb_base.c Antonino A. Daplas 2006-03-27 2406 par->pll_ops = &aty_pll_ibm514;
eba87e8e8d7024d drivers/video/aty/atyfb_base.c Antonino A. Daplas 2006-03-27 2407 break;
eba87e8e8d7024d drivers/video/aty/atyfb_base.c Antonino A. Daplas 2006-03-27 2408 #endif
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2409 default:
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2410 PRINTKI("aty_init: CLK type not implemented yet!");
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2411 par->pll_ops = &aty_pll_unsupported;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2412 break;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2413 }
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2414 }
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2415 #endif /* CONFIG_FB_ATY_GX */
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2416 #ifdef CONFIG_FB_ATY_CT
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2417 if (M64_HAS(INTEGRATED)) {
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2418 par->dac_ops = &aty_dac_ct;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2419 par->pll_ops = &aty_pll_ct;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2420 par->bus_type = PCI;
fe86175bce50bc3 drivers/video/aty/atyfb_base.c Randy Dunlap 2009-02-04 2421 par->ram_type = (aty_ld_le32(CNFG_STAT0, par) & 0x07);
ee905d0c58a440a drivers/video/aty/atyfb_base.c Ville Syrjala 2009-06-30 2422 if (M64_HAS(XL_MEM))
ee905d0c58a440a drivers/video/aty/atyfb_base.c Ville Syrjala 2009-06-30 2423 ramname = aty_xl_ram[par->ram_type];
ee905d0c58a440a drivers/video/aty/atyfb_base.c Ville Syrjala 2009-06-30 2424 else
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2425 ramname = aty_ct_ram[par->ram_type];
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2426 /* for many chips, the mclk is 67 MHz for SDRAM, 63 MHz otherwise */
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2427 if (par->pll_limits.mclk == 67 && par->ram_type < SDRAM)
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2428 par->pll_limits.mclk = 63;
159dde93692ef54 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2429 /* Mobility + 32bit memory interface need halved XCLK. */
159dde93692ef54 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2430 if (M64_HAS(MOBIL_BUS) && par->ram_type == SDRAM32)
159dde93692ef54 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2431 par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1;
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2432 }
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2433 #endif
c0887eedb4498e2 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-06-27 2434 #ifdef CONFIG_PPC_PMAC
689620100172e24 drivers/video/aty/atyfb_base.c Ville Syrjala 2009-09-22 2435 /*
689620100172e24 drivers/video/aty/atyfb_base.c Ville Syrjala 2009-09-22 2436 * The Apple iBook1 uses non-standard memory frequencies.
689620100172e24 drivers/video/aty/atyfb_base.c Ville Syrjala 2009-09-22 2437 * We detect it and set the frequency manually.
689620100172e24 drivers/video/aty/atyfb_base.c Ville Syrjala 2009-09-22 2438 */
71a157e8edca551 drivers/video/aty/atyfb_base.c Grant Likely 2010-02-01 2439 if (of_machine_is_compatible("PowerBook2,1")) {
c0887eedb4498e2 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-06-27 2440 par->pll_limits.mclk = 70;
c0887eedb4498e2 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-06-27 2441 par->pll_limits.xclk = 53;
c0887eedb4498e2 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-06-27 2442 }
c0887eedb4498e2 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-06-27 2443 #endif
^1da177e4c3f415 drivers/video/aty/atyfb_base.c Linus Torvalds 2005-04-16 2444
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2445 /* Allow command line to override clocks. */
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2446 if (pll)
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2447 par->pll_limits.pll_max = pll;
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2448 if (mclk)
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2449 par->pll_limits.mclk = mclk;
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2450 if (xclk)
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2451 par->pll_limits.xclk = xclk;
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2452
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2453 aty_calc_mem_refresh(par, par->pll_limits.xclk);
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2454 par->pll_per = 1000000/par->pll_limits.pll_max;
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2455 par->mclk_per = 1000000/par->pll_limits.mclk;
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2456 par->xclk_per = 1000000/par->pll_limits.xclk;
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2457
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2458 par->ref_clk_per = 1000000000000ULL / 14318180;
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2459 xtal = "14.31818";
b4e124c138558a0 drivers/video/aty/atyfb_base.c Ville Syrjala 2007-05-08 2460
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
On Fri, 27 Nov 2020, Sam Ravnborg wrote:
Fix trivial W=1 warnings.
Update kernel-doc to avoid the warnings.
Can you put what's being fixed in the subject line please?
"fix w=1 warnings" is very bland and this it is unlikely to be the
only w=1 warning that gets fixed in these files, so has a high likely
hood of having an identical subject-line as a previous/future patch.
With regards to the latter point; I have personally found subject
lines to be a pretty reliable way of maintaining/backporting older
kernels. The nomenclature here would taint that pretty readily.
quoted hunk Signed-off-by: Sam Ravnborg <redacted>
Cc: Sam Ravnborg <redacted>
Cc: linux-fbdev@vger.kernel.org
---
drivers/video/of_display_timing.c | 1 +
drivers/video/of_videomode.c | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index abc9ada798ee..f93b6abbe258 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 that contains the result . I may be partially written in case of errors
**/
static int of_parse_display_timing ( const struct device_node * np ,
struct display_timing * dt ) diff --git a/drivers/video/of_videomode.c b/drivers/video/of_videomode.c
index 67aff2421c29..a5bb02f02b44 100644
--- a/drivers/video/of_videomode.c
+++ b/drivers/video/of_videomode.c @@ -13,10 +13,10 @@
#include <video/videomode.h>
/**
- * 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
+ * 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 .)
*
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Hi Lee,
On Sat, Nov 28, 2020 at 08:28:20AM +0000, Lee Jones wrote: On Fri, 27 Nov 2020, Sam Ravnborg wrote:
quoted Fix trivial W=1 warnings.
Update kernel-doc to avoid the warnings.
Can you put what's being fixed in the subject line please?
"fix w=1 warnings" is very bland and this it is unlikely to be the
only w=1 warning that gets fixed in these files, so has a high likely
hood of having an identical subject-line as a previous/future patch.
With regards to the latter point; I have personally found subject
lines to be a pretty reliable way of maintaining/backporting older
kernels. The nomenclature here would taint that pretty readily.
Thanks for the feedback and the background for your comment.
Will fix them all for v2,
Sam