Skip to content

Commit

Permalink
video: fbdev: mx3fb: Fix kernel-doc, set but not used and string warn…
Browse files Browse the repository at this point in the history
…ings

Fix W=1 warnings:
- Fix kernel-doc
- Drop unused code/variables
- Use memcpy to copy a string without zero-termination
  strncpy() generates a warning

v2:
  - Updated subject (Lee)

Signed-off-by: Sam Ravnborg <[email protected]>
Acked-by: Thomas Zimmermann <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Xiaofei Tan <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Lee Jones <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
sravnborg committed Nov 30, 2020
1 parent 2f71315 commit 9b028f4
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions drivers/video/fbdev/mx3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,15 +445,14 @@ 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)
return;

spin_lock_irqsave(&mx3fb->lock, flags);

enabled = sdc_fb_uninit(mx3_fbi);
sdc_fb_uninit(mx3_fbi);

spin_unlock_irqrestore(&mx3fb->lock, flags);

Expand Down Expand Up @@ -732,15 +731,15 @@ 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)
{
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;

Expand Down Expand Up @@ -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)
{
Expand All @@ -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
*/
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 9b028f4

Please sign in to comment.