staging: sm750fb: fix function parameter alignment
Subsystems (2)
PATCH v3 1/2 staging: sm750fb: fix function parameter alignment
From: Ignacio Pena <[email protected]>
Fix checkpatch warning about improper function parameter alignment in sm750_hw_cursor_set_pos function call.
---
Changes in v3:
- Removed the const declaration patch as g_fbmode is modified at runtime
- Split only into alignment and naming fixes
drivers/staging/sm750fb/sm750.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/sm750fb/sm750.c +2 -2
@@ -125,8 +125,8 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)if (fbcursor->set &FB_CUR_SETPOS )sm750_hw_cursor_set_pos (cursor, - fbcursor->image.dx - info->var.xoffset, - fbcursor->image.dy - info->var.yoffset); + fbcursor->image.dx - info->var.xoffset, + fbcursor->image.dy - info->var.yoffset);if (fbcursor->set &FB_CUR_SETCMAP ) {/* get the 16bit color of kernel means */
Signature · 1 line
2.39.3
PATCH v3 2/2 staging: sm750fb: fix CamelCase variable naming
From: Ignacio Pena <[email protected]>
Replace CamelCase variable 'Bpp' with lowercase 'bpp' to fix checkpatch warnings about improper variable naming convention.
---
Changes in v3:
- Removed the const declaration patch as g_fbmode is modified at runtime
- Split only into alignment and naming fixes
drivers/staging/sm750fb/sm750.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/sm750fb/sm750.c +10 -9
@@ -161,7 +161,7 @@ static void lynxfb_ops_fillrect(struct fb_info *info, {struct lynxfb_par *par;struct sm750_dev *sm750_dev; -unsigned int base, pitch, Bpp, rop; +unsigned int base, pitch, bpp, rop;u32 color;if (info->state !=FBINFO_STATE_RUNNING )
@@ -175,10 +175,10 @@ static void lynxfb_ops_fillrect(struct fb_info *info,*/ base = par->crtc.o_screen; pitch = info->fix.line_length; - Bpp = info->var.bits_per_pixel >>3 ; + bpp = info->var.bits_per_pixel >>3 ; - color = (Bpp ==1 ) ? region->color : + color = (bpp ==1 ) ? region->color : ((u32 *)info->pseudo_palette)[region->color]; rop = (region->rop !=ROP_COPY ) ?HW_ROP2_XOR :HW_ROP2_COPY ;
@@ -191,7 +191,7 @@ static void lynxfb_ops_fillrect(struct fb_info *info,spin_lock (&sm750_dev->slock); sm750_dev->accel.de_fillrect (&sm750_dev->accel, - base, pitch, Bpp, + base, pitch, bpp, region->dx, region->dy, region->width, region->height, color, rop);
@@ -203,7 +203,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info, {struct lynxfb_par *par;struct sm750_dev *sm750_dev; -unsigned int base, pitch, Bpp; +unsigned int base, pitch, bpp; par = info->par; sm750_dev = par->dev;
@@ -214,7 +214,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info,*/ base = par->crtc.o_screen; pitch = info->fix.line_length; - Bpp = info->var.bits_per_pixel >>3 ; + bpp = info->var.bits_per_pixel >>3 ;/* * If not use spin_lock, system will die if user load driver
@@ -226,7 +226,7 @@ static void lynxfb_ops_copyarea(struct fb_info *info, sm750_dev->accel.de_copyarea (&sm750_dev->accel, base, pitch, region->sx, region->sy, - base, pitch, Bpp, region->dx, region->dy, + base, pitch, bpp, region->dx, region->dy, region->width, region->height,HW_ROP2_COPY );spin_unlock (&sm750_dev->slock);
@@ -235,7 +235,7 @@ static void lynxfb_ops_imageblit(struct fb_info *info, const struct fb_image *image) {unsigned int base, pitch, Bpp; +unsigned int base, pitch, bpp;unsigned int fgcol, bgcol;struct lynxfb_par *par;struct sm750_dev *sm750_dev;
@@ -248,7 +248,7 @@ static void lynxfb_ops_imageblit(struct fb_info *info,*/ base = par->crtc.o_screen; pitch = info->fix.line_length; - Bpp = info->var.bits_per_pixel >>3 ; + bpp = info->var.bits_per_pixel >>3 ;/* TODO: Implement hardware acceleration for image->depth > 1 */ if (image->depth !=1 ) {
@@ -274,7 +274,7 @@ static void lynxfb_ops_imageblit(struct fb_info *info, sm750_dev->accel.de_imageblit (&sm750_dev->accel, image->data, image->width >>3 ,0 , - base, pitch, Bpp, + base, pitch, bpp, image->dx, image->dy, image->width, image->height, fgcol, bgcol,HW_ROP2_COPY );
Signature · 1 line
2.39.3
Greg KH
maintainerRe: [PATCH v3 2/2] staging: sm750fb: fix CamelCase variable naming
Quoted 11 lines · Ignacio Peña
From: Ignacio Pena <[email protected]>
Replace CamelCase variable 'Bpp' with lowercase 'bpp' to fix checkpatch warnings about improper variable naming convention.
Signed-off-by Ignacio Pena <[email protected]>---
Changes in v3:
- Removed the const declaration patch asg_fbmodeis modified at runtime
- Split only into alignment and naming fixes
This patch is somehow corrupted:
Hunk #1 succeeded at 160 (offset -1 lines).
patch: **** malformed patch at line 47: @@ -191,7 +191,7 @@ static void lynxfb_ops_fillrect(struct fb_info *info,
How did you create it?
thanks,
greg k-h