staging: sm750fb: Style cleanup for sm750fb
cover staging: sm750fb: Style cleanup for sm750fb
This set of patches addresses a number of cleanups attributed to drivers/staging/sm750fb/sm750_cursor.h.
Patch 1: Rename sm750_hw_cursor_setSize to sm750_hw_cursor_set_size Patch 2: Rename sm750_hw_cursor_setPos to sm750_hw_cursor_set_pos Patch 3: Rename sm750_hw_cursor_setColor to sm750_hw_cursor_set_color Patch 4: Rename sm750_hw_cursor_setData to sm750_hw_cursor_set_data Patch 5: Rename sm750_hw_cursor_setData2 to sm750_hw_cursor_set_data2
Eric Florin (5):
staging: sm750fb: rename sm750_hw_cursor_setSize
staging: sm750fb: rename sm750_hw_cursor_setPos
staging: sm750fb: rename sm750_hw_cursor_setColor
staging: sm750fb: rename sm750_hw_cursor_setData
staging: sm750fb: rename sm750_hw_cursor_setData2
drivers/staging/sm750fb/sm750.c | 12 +++++------- drivers/staging/sm750fb/sm750_cursor.c | 14 +++++++------- drivers/staging/sm750fb/sm750_cursor.h | 12 ++++++------ 3 files changed, 18 insertions(+), 20 deletions(-)
Signature · 1 line
2.39.5
PATCH 1/5 staging: sm750fb: rename sm750_hw_cursor_setSize
Rename sm750_hw_cursor_setSize to sm750_hw_cursor_set_size to conform to kernel style guidelines as reported by checkpatch.pl
CHECK: Avoid CamelCase: <sm750_hw_cursor_setSize>
--- drivers/staging/sm750fb/sm750.c | 2 +- drivers/staging/sm750fb/sm750_cursor.c | 2 +- drivers/staging/sm750fb/sm750_cursor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/sm750fb/sm750.c +1 -1
@@ -120,7 +120,7 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)sm750_hw_cursor_disable (cursor);if (fbcursor->set &FB_CUR_SETSIZE ) -sm750_hw_cursor_setSize (cursor, +sm750_hw_cursor_set_size (cursor, fbcursor->image.width, fbcursor->image.height);
drivers/staging/sm750fb/sm750_cursor.c +1 -1
@@ -57,7 +57,7 @@ void sm750_hw_cursor_disable(struct lynx_cursor *cursor)poke32 (HWC_ADDRESS ,0 ); } -void sm750_hw_cursor_setSize (struct lynx_cursor *cursor,int w,int h) +void sm750_hw_cursor_set_size (struct lynx_cursor *cursor,int w,int h) { cursor->w = w; cursor->h = h;
drivers/staging/sm750fb/sm750_cursor.h +1 -1
@@ -5,7 +5,7 @@/* hw_cursor_xxx works for voyager,718 and 750 */ void sm750_hw_cursor_enable (struct lynx_cursor *cursor);void sm750_hw_cursor_disable (struct lynx_cursor *cursor); -void sm750_hw_cursor_setSize (struct lynx_cursor *cursor,int w,int h); +void sm750_hw_cursor_set_size (struct lynx_cursor *cursor,int w,int h);void sm750_hw_cursor_setPos (struct lynx_cursor *cursor,int x,int y);void sm750_hw_cursor_setColor (struct lynx_cursor *cursor,u32 fg,u32 bg); void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop,
Signature · 1 line
2.39.5
PATCH 2/5 staging: sm750fb: rename sm750_hw_cursor_setPos
In reply to Eric FlorinRename sm750_hw_cursor_setPos to sm750_hw_cursor_set_pos to conform with kernel style guidelines as reported by checkpatch.pl
CHECK: Avoid CamelCase: <sm750_hw_cursor_setPos>
--- drivers/staging/sm750fb/sm750.c | 2 +- drivers/staging/sm750fb/sm750_cursor.c | 2 +- drivers/staging/sm750fb/sm750_cursor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/sm750fb/sm750.c +1 -1
@@ -125,7 +125,7 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) fbcursor->image.height);if (fbcursor->set &FB_CUR_SETPOS ) -sm750_hw_cursor_setPos (cursor, +sm750_hw_cursor_set_pos (cursor, fbcursor->image.dx - info->var.xoffset, fbcursor->image.dy - info->var.yoffset);
drivers/staging/sm750fb/sm750_cursor.c +1 -1
@@ -63,7 +63,7 @@ void sm750_hw_cursor_set_size(struct lynx_cursor *cursor, int w, int h) cursor->h = h; } -void sm750_hw_cursor_setPos (struct lynx_cursor *cursor,int x,int y) +void sm750_hw_cursor_set_pos (struct lynx_cursor *cursor,int x,int y) {u32 reg;
drivers/staging/sm750fb/sm750_cursor.h +1 -1
@@ -6,7 +6,7 @@void sm750_hw_cursor_enable (struct lynx_cursor *cursor);void sm750_hw_cursor_disable (struct lynx_cursor *cursor);void sm750_hw_cursor_set_size (struct lynx_cursor *cursor,int w,int h); -void sm750_hw_cursor_setPos (struct lynx_cursor *cursor,int x,int y); +void sm750_hw_cursor_set_pos (struct lynx_cursor *cursor,int x,int y);void sm750_hw_cursor_setColor (struct lynx_cursor *cursor,u32 fg,u32 bg);void sm750_hw_cursor_setData (struct lynx_cursor *cursor,u16 rop,const u8 *data,const u8 *mask);
Signature · 1 line
2.39.5
PATCH 3/5 staging: sm750fb: rename sm750_hw_cursor_setColor
In reply to Eric FlorinRename sm750_hw_cursor_setColor to sm750_hw_cursor_set_color to conform with kernel style guidelines as reported by checkpatch.pl
CHECK: Avoid CamelCase: <sm750_hw_cursor_setColor>
--- drivers/staging/sm750fb/sm750.c | 2 +- drivers/staging/sm750fb/sm750_cursor.c | 2 +- drivers/staging/sm750fb/sm750_cursor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/sm750fb/sm750.c +1 -1
@@ -141,7 +141,7 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) ((info->cmap.green[fbcursor->image.bg_color] &0xfc00 ) >>5 ) | ((info->cmap.blue[fbcursor->image.bg_color] &0xf800 ) >>11 ); -sm750_hw_cursor_setColor (cursor, fg, bg); +sm750_hw_cursor_set_color (cursor, fg, bg); }if (fbcursor->set & (FB_CUR_SETSHAPE |FB_CUR_SETIMAGE )) {
drivers/staging/sm750fb/sm750_cursor.c +1 -1
@@ -72,7 +72,7 @@ void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int x, int y)poke32 (HWC_LOCATION , reg); } -void sm750_hw_cursor_setColor (struct lynx_cursor *cursor,u32 fg,u32 bg) +void sm750_hw_cursor_set_color (struct lynx_cursor *cursor,u32 fg,u32 bg) {u32 reg = (fg <<HWC_COLOR_12_2_RGB565_SHIFT ) &HWC_COLOR_12_2_RGB565_MASK ;
drivers/staging/sm750fb/sm750_cursor.h +1 -1
@@ -7,7 +7,7 @@ void sm750_hw_cursor_enable(struct lynx_cursor *cursor);void sm750_hw_cursor_disable (struct lynx_cursor *cursor);void sm750_hw_cursor_set_size (struct lynx_cursor *cursor,int w,int h);void sm750_hw_cursor_set_pos (struct lynx_cursor *cursor,int x,int y); -void sm750_hw_cursor_setColor (struct lynx_cursor *cursor,u32 fg,u32 bg); +void sm750_hw_cursor_set_color (struct lynx_cursor *cursor,u32 fg,u32 bg);void sm750_hw_cursor_setData (struct lynx_cursor *cursor,u16 rop,const u8 *data,const u8 *mask); void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop,
Signature · 1 line
2.39.5
PATCH 4/5 staging: sm750fb: rename sm750_hw_cursor_setData
In reply to Eric FlorinRename sm750_hw_cursor_setData to sm750_hw_cursor_set_data to conform with kernel style guidelines as reported by checkpatch.pl
CHECK: Avoid CamelCase: <sm750_hw_cursor_setData>
--- drivers/staging/sm750fb/sm750.c | 6 ++---- drivers/staging/sm750fb/sm750_cursor.c | 4 ++-- drivers/staging/sm750fb/sm750_cursor.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/staging/sm750fb/sm750.c +2 -4
@@ -145,10 +145,8 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) }if (fbcursor->set & (FB_CUR_SETSHAPE |FB_CUR_SETIMAGE )) { -sm750_hw_cursor_setData (cursor, - fbcursor->rop, - fbcursor->image.data, - fbcursor->mask); +sm750_hw_cursor_set_data (cursor, fbcursor->rop, fbcursor->image.data, + fbcursor->mask); }if (fbcursor->enable)
drivers/staging/sm750fb/sm750_cursor.c +2 -2
@@ -81,8 +81,8 @@ void sm750_hw_cursor_set_color(struct lynx_cursor *cursor, u32 fg, u32 bg)poke32 (HWC_COLOR_3 ,0xffe0 ); } -void sm750_hw_cursor_setData (struct lynx_cursor *cursor,u16 rop, -const u8 *pcol,const u8 *pmsk) +void sm750_hw_cursor_set_data (struct lynx_cursor *cursor,u16 rop, +const u8 *pcol,const u8 *pmsk) {int i, j, count, pitch, offset;u8 color, mask, opr;
drivers/staging/sm750fb/sm750_cursor.h +2 -2
@@ -8,8 +8,8 @@ void sm750_hw_cursor_disable(struct lynx_cursor *cursor);void sm750_hw_cursor_set_size (struct lynx_cursor *cursor,int w,int h);void sm750_hw_cursor_set_pos (struct lynx_cursor *cursor,int x,int y);void sm750_hw_cursor_set_color (struct lynx_cursor *cursor,u32 fg,u32 bg); -void sm750_hw_cursor_setData (struct lynx_cursor *cursor,u16 rop, -const u8 *data,const u8 *mask); +void sm750_hw_cursor_set_data (struct lynx_cursor *cursor,u16 rop, +const u8 *data,const u8 *mask);void sm750_hw_cursor_setData2 (struct lynx_cursor *cursor,u16 rop,const u8 *data,const u8 *mask);#endif
Signature · 1 line
2.39.5
PATCH 5/5 staging: sm750fb: rename sm750_hw_cursor_setData2
In reply to Eric FlorinRename sm750_hw_cursor_setData2 to sm750_hw_cursor_set_data2 to conform with kernel style guidelines as reported by checkpatch.pl
CHECK: Avoid CamelCase: <sm750_hw_cursor_setData2>
--- drivers/staging/sm750fb/sm750_cursor.c | 4 ++-- drivers/staging/sm750fb/sm750_cursor.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/sm750fb/sm750_cursor.c +2 -2
@@ -131,8 +131,8 @@ void sm750_hw_cursor_set_data(struct lynx_cursor *cursor, u16 rop, } } -void sm750_hw_cursor_setData2 (struct lynx_cursor *cursor,u16 rop, -const u8 *pcol,const u8 *pmsk) +void sm750_hw_cursor_set_data2 (struct lynx_cursor *cursor,u16 rop, +const u8 *pcol,const u8 *pmsk) {int i, j, count, pitch, offset;u8 color, mask;
drivers/staging/sm750fb/sm750_cursor.h +2 -2
@@ -10,6 +10,6 @@ void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int x, int y);void sm750_hw_cursor_set_color (struct lynx_cursor *cursor,u32 fg,u32 bg);void sm750_hw_cursor_set_data (struct lynx_cursor *cursor,u16 rop,const u8 *data,const u8 *mask); -void sm750_hw_cursor_setData2 (struct lynx_cursor *cursor,u16 rop, -const u8 *data,const u8 *mask); +void sm750_hw_cursor_set_data2 (struct lynx_cursor *cursor,u16 rop, +const u8 *data,const u8 *mask);#endif
Signature · 1 line
2.39.5