| Message ID | 20201128224114.1033617-25-sam@ravnborg.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drivers/video: W=1 warning fixes | expand |
Am 28.11.20 um 23:41 schrieb Sam Ravnborg: > Fix several W=1 warnings > - Updated kernel-doc as needed > - Deleted unused local variable, it was assigned but never used > > v2: > - Updated subject (Lee) > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Jingoo Han <jingoohan1@gmail.com> > Cc: linux-fbdev@vger.kernel.org > Cc: Lee Jones <lee.jones@linaro.org> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > 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; >
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;
Fix several W=1 warnings - Updated kernel-doc as needed - Deleted unused local variable, it was assigned but never used v2: - Updated subject (Lee) Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Jingoo Han <jingoohan1@gmail.com> Cc: linux-fbdev@vger.kernel.org Cc: Lee Jones <lee.jones@linaro.org> --- drivers/video/fbdev/s3c-fb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)