fix multiple checkpatch warnings
Subsystems (2)
v2 cover fix multiple checkpatch warnings
Fix multiple code styling warnings issued by checkpatch on files in sm750fb driver
Arushi Singhal (4):
staging: sm750fb: function prototype argument should have an
identifier name
staging: sm750fb: fixes add blank line after
function/struct/union/enum declarations
staging: sm750fb: Alignment should match open parenthesis
staging: sm750fb: Remove typedefs
drivers/staging/sm750fb/ddk750_display.h | 2 +- drivers/staging/sm750fb/ddk750_mode.c | 83 ++++++++++++++++---------------- drivers/staging/sm750fb/ddk750_mode.h | 20 ++++---- drivers/staging/sm750fb/ddk750_power.h | 2 +- drivers/staging/sm750fb/sm750.h | 4 +- drivers/staging/sm750fb/sm750_cursor.c | 3 ++ drivers/staging/sm750fb/sm750_hw.c | 2 +- 7 files changed, 58 insertions(+), 58 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/4 staging: sm750fb: function prototype argument should have an identifier name
function prototype arguments like 'struct vb_device_info *','unsigned long' etc. should have an identifier name.
---
changes in v2
- add the identifier name of one more prototype arguments.
drivers/staging/sm750fb/ddk750_display.h | 2 +- drivers/staging/sm750fb/ddk750_mode.h | 2 +- drivers/staging/sm750fb/ddk750_power.h | 2 +- drivers/staging/sm750fb/sm750.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/sm750fb/ddk750_display.h +1 -1
@@ -102,6 +102,6 @@ typedef enum _disp_output_t { } disp_output_t; -void ddk750_setLogicalDispOut (disp_output_t ); +void ddk750_setLogicalDispOut (disp_output_t output);#endif
drivers/staging/sm750fb/ddk750_mode.h +1 -1
@@ -34,6 +34,6 @@ typedef struct _mode_parameter_t { } mode_parameter_t; -int ddk750_setModeTiming (mode_parameter_t *,clock_type_t ); +int ddk750_setModeTiming (mode_parameter_t *parm,clock_type_t clock);#endif
drivers/staging/sm750fb/ddk750_power.h +1 -1
@@ -14,7 +14,7 @@ DPMS_t; (peek32(MISC_CTRL) & ~MISC_CTRL_DAC_POWER_OFF) | (off)); \ } -void ddk750_set_dpms (DPMS_t ); +void ddk750_set_dpms (DPMS_t state);void sm750_set_power_mode (unsigned int powerMode);void sm750_set_current_gate (unsigned int gate);
drivers/staging/sm750fb/sm750.h +2 -2
@@ -184,8 +184,8 @@ static inline unsigned long ps_to_hz(unsigned int psvalue) }int hw_sm750_map (struct sm750_dev *sm750_dev,struct pci_dev *pdev); -int hw_sm750_inithw (struct sm750_dev *,struct pci_dev *); -void hw_sm750_initAccel (struct sm750_dev *); +int hw_sm750_inithw (struct sm750_dev *sm750_dev,struct pci_dev *pdev); +void hw_sm750_initAccel (struct sm750_dev *sm750_dev);int hw_sm750_deWait (void );int hw_sm750le_deWait (void );
Signature · 1 line
2.11.0
PATCH v2 2/4 staging: sm750fb: fixes add blank line after function/struct/union/enum declarations
In reply to Arushi SinghalThis patch fixes the warnings reported by checkpatch.pl for please use a blank line after function/struct/union/enum declarations.
--- drivers/staging/sm750fb/sm750_cursor.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/sm750fb/sm750_cursor.c +3 -0
@@ -54,6 +54,7 @@ void sm750_hw_cursor_enable(struct lynx_cursor *cursor) reg = (cursor->offset &HWC_ADDRESS_ADDRESS_MASK ) |HWC_ADDRESS_ENABLE ;poke32 (HWC_ADDRESS , reg); } +void sm750_hw_cursor_disable (struct lynx_cursor *cursor) {poke32 (HWC_ADDRESS ,0 );
@@ -65,6 +66,7 @@ void sm750_hw_cursor_setSize(struct lynx_cursor *cursor, cursor->w = w; cursor->h = h; } +void sm750_hw_cursor_setPos (struct lynx_cursor *cursor,int x,int y) {
@@ -74,6 +76,7 @@ void sm750_hw_cursor_setPos(struct lynx_cursor *cursor, (x &HWC_LOCATION_X_MASK );poke32 (HWC_LOCATION , reg); } +void sm750_hw_cursor_setColor (struct lynx_cursor *cursor,u32 fg,u32 bg) {
Signature · 1 line
2.11.0
PATCH v2 3/4 staging: sm750fb: Alignment should match open parenthesis
In reply to Arushi SinghalFix checkpatch issues: "CHECK: Alignment should match open parenthesis".
--- drivers/staging/sm750fb/ddk750_mode.c | 79 +++++++++++++++++------------------ 1 file changed, 39 insertions(+), 40 deletions(-)
drivers/staging/sm750fb/ddk750_mode.c +39 -40
@@ -28,9 +28,9 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,poke32 (CRT_AUTO_CENTERING_TL ,0 );poke32 (CRT_AUTO_CENTERING_BR , - (((y -1 ) <<CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT ) & -CRT_AUTO_CENTERING_BR_BOTTOM_MASK ) | - ((x -1 ) &CRT_AUTO_CENTERING_BR_RIGHT_MASK )); + (((y -1 ) <<CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT ) & +CRT_AUTO_CENTERING_BR_BOTTOM_MASK ) | + ((x -1 ) &CRT_AUTO_CENTERING_BR_RIGHT_MASK ));/* * Assume common fields in dispControl have been properly set before
@@ -72,8 +72,7 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam, }/* only timing related registers will be programed */ -static int programModeRegisters (mode_parameter_t *pModeParam, -struct pll_value *pll) +static int programModeRegisters (mode_parameter_t *pModeParam,struct pll_value *pll) {int ret =0 ;int cnt =0 ;
@@ -83,32 +82,32 @@ static int programModeRegisters(mode_parameter_t *pModeParam,/* programe secondary pixel clock */ poke32 (CRT_PLL_CTRL ,sm750_format_pll_reg (pll));poke32 (CRT_HORIZONTAL_TOTAL , - (((pModeParam->horizontal_total -1 ) << -CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT ) & -CRT_HORIZONTAL_TOTAL_TOTAL_MASK ) | - ((pModeParam->horizontal_display_end -1 ) & -CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK )); + (((pModeParam->horizontal_total -1 ) << +CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT ) & +CRT_HORIZONTAL_TOTAL_TOTAL_MASK ) | + ((pModeParam->horizontal_display_end -1 ) & +CRT_HORIZONTAL_TOTAL_DISPLAY_END_MASK ));poke32 (CRT_HORIZONTAL_SYNC , - ((pModeParam->horizontal_sync_width << -CRT_HORIZONTAL_SYNC_WIDTH_SHIFT ) & -CRT_HORIZONTAL_SYNC_WIDTH_MASK ) | - ((pModeParam->horizontal_sync_start -1 ) & -CRT_HORIZONTAL_SYNC_START_MASK )); + ((pModeParam->horizontal_sync_width << +CRT_HORIZONTAL_SYNC_WIDTH_SHIFT ) & +CRT_HORIZONTAL_SYNC_WIDTH_MASK ) | + ((pModeParam->horizontal_sync_start -1 ) & +CRT_HORIZONTAL_SYNC_START_MASK ));poke32 (CRT_VERTICAL_TOTAL , - (((pModeParam->vertical_total -1 ) << -CRT_VERTICAL_TOTAL_TOTAL_SHIFT ) & -CRT_VERTICAL_TOTAL_TOTAL_MASK ) | - ((pModeParam->vertical_display_end -1 ) & -CRT_VERTICAL_TOTAL_DISPLAY_END_MASK )); + (((pModeParam->vertical_total -1 ) << +CRT_VERTICAL_TOTAL_TOTAL_SHIFT ) & +CRT_VERTICAL_TOTAL_TOTAL_MASK ) | + ((pModeParam->vertical_display_end -1 ) & +CRT_VERTICAL_TOTAL_DISPLAY_END_MASK ));poke32 (CRT_VERTICAL_SYNC , - ((pModeParam->vertical_sync_height << -CRT_VERTICAL_SYNC_HEIGHT_SHIFT ) & -CRT_VERTICAL_SYNC_HEIGHT_MASK ) | - ((pModeParam->vertical_sync_start -1 ) & -CRT_VERTICAL_SYNC_START_MASK )); + ((pModeParam->vertical_sync_height << +CRT_VERTICAL_SYNC_HEIGHT_SHIFT ) & +CRT_VERTICAL_SYNC_HEIGHT_MASK ) | + ((pModeParam->vertical_sync_start -1 ) & +CRT_VERTICAL_SYNC_START_MASK )); tmp =DISPLAY_CTRL_TIMING |DISPLAY_CTRL_PLANE ;if (pModeParam->vertical_sync_polarity)
@@ -140,25 +139,25 @@ static int programModeRegisters(mode_parameter_t *pModeParam,poke32 (PANEL_HORIZONTAL_TOTAL , reg);poke32 (PANEL_HORIZONTAL_SYNC , - ((pModeParam->horizontal_sync_width << -PANEL_HORIZONTAL_SYNC_WIDTH_SHIFT ) & -PANEL_HORIZONTAL_SYNC_WIDTH_MASK ) | - ((pModeParam->horizontal_sync_start -1 ) & -PANEL_HORIZONTAL_SYNC_START_MASK )); + ((pModeParam->horizontal_sync_width << +PANEL_HORIZONTAL_SYNC_WIDTH_SHIFT ) & +PANEL_HORIZONTAL_SYNC_WIDTH_MASK ) | + ((pModeParam->horizontal_sync_start -1 ) & +PANEL_HORIZONTAL_SYNC_START_MASK ));poke32 (PANEL_VERTICAL_TOTAL , - (((pModeParam->vertical_total -1 ) << -PANEL_VERTICAL_TOTAL_TOTAL_SHIFT ) & -PANEL_VERTICAL_TOTAL_TOTAL_MASK ) | - ((pModeParam->vertical_display_end -1 ) & -PANEL_VERTICAL_TOTAL_DISPLAY_END_MASK )); + (((pModeParam->vertical_total -1 ) << +PANEL_VERTICAL_TOTAL_TOTAL_SHIFT ) & +PANEL_VERTICAL_TOTAL_TOTAL_MASK ) | + ((pModeParam->vertical_display_end -1 ) & +PANEL_VERTICAL_TOTAL_DISPLAY_END_MASK ));poke32 (PANEL_VERTICAL_SYNC , - ((pModeParam->vertical_sync_height << -PANEL_VERTICAL_SYNC_HEIGHT_SHIFT ) & -PANEL_VERTICAL_SYNC_HEIGHT_MASK ) | - ((pModeParam->vertical_sync_start -1 ) & -PANEL_VERTICAL_SYNC_START_MASK )); + ((pModeParam->vertical_sync_height << +PANEL_VERTICAL_SYNC_HEIGHT_SHIFT ) & +PANEL_VERTICAL_SYNC_HEIGHT_MASK ) | + ((pModeParam->vertical_sync_start -1 ) & +PANEL_VERTICAL_SYNC_START_MASK )); tmp =DISPLAY_CTRL_TIMING |DISPLAY_CTRL_PLANE ;if (pModeParam->vertical_sync_polarity)
Signature · 1 line
2.11.0
PATCH v2 4/4 staging: sm750fb: Remove typedefs
In reply to Arushi SinghalThis patch removes typedefs from structures and renames them as per kernel coding standards.
--- drivers/staging/sm750fb/ddk750_mode.c | 6 +++--- drivers/staging/sm750fb/ddk750_mode.h | 20 +++++++++----------- drivers/staging/sm750fb/sm750_hw.c | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-)
drivers/staging/sm750fb/ddk750_mode.c +3 -3
@@ -12,7 +12,7 @@* HW only supports 7 predefined pixel clocks, and clock select is * in bit 29:27 of Display Control register. */ -static unsigned long displayControlAdjust_SM750LE (mode_parameter_t *pModeParam,unsigned long dispControl) +static unsigned long displayControlAdjust_SM750LE (struct _mode_parameter_t *pModeParam,unsigned long dispControl) {unsigned long x, y;
@@ -72,7 +72,7 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam, }/* only timing related registers will be programed */ -static int programModeRegisters (mode_parameter_t *pModeParam,struct pll_value *pll) +static int programModeRegisters (struct _mode_parameter_t *pModeParam,struct pll_value *pll) {int ret =0 ;int cnt =0 ;
@@ -198,7 +198,7 @@ static int programModeRegisters(mode_parameter_t *pModeParam, struct pll_value *return ret; } -int ddk750_setModeTiming (mode_parameter_t *parm,clock_type_t clock) +int ddk750_setModeTiming (struct _mode_parameter_t *parm,clock_type_t clock) {struct pll_value pll;unsigned int uiActualPixelClk;
drivers/staging/sm750fb/ddk750_mode.h +9 -11
@@ -3,37 +3,35 @@#include "ddk750_chip.h" -typedef enum _spolarity_t { +enum _spolarity_t {POS =0 ,/* positive */ NEG ,/* negative */ -} -spolarity_t ; +}; -typedef struct _mode_parameter_t { +struct _mode_parameter_t {/* Horizontal timing. */ unsigned long horizontal_total;unsigned long horizontal_display_end;unsigned long horizontal_sync_start;unsigned long horizontal_sync_width; -spolarity_t horizontal_sync_polarity; +enum _spolarity_t horizontal_sync_polarity;/* Vertical timing. */ unsigned long vertical_total;unsigned long vertical_display_end;unsigned long vertical_sync_start;unsigned long vertical_sync_height; -spolarity_t vertical_sync_polarity; +enum _spolarity_t vertical_sync_polarity;/* Refresh timing. */ unsigned long pixel_clock;unsigned long horizontal_frequency; -unsigned long vertical_frequency; +enum _spolarity_t vertical_frequency;/* Clock Phase. This clock phase only applies to Panel. */ -spolarity_t clock_phase_polarity; -} -mode_parameter_t ; +enum _spolarity_t clock_phase_polarity; +}; -int ddk750_setModeTiming (mode_parameter_t *parm,clock_type_t clock); +int ddk750_setModeTiming (struct _mode_parameter_t *parm,clock_type_t clock);#endif
drivers/staging/sm750fb/sm750_hw.c +1 -1
@@ -252,7 +252,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, {int ret, fmt;u32 reg; -mode_parameter_t modparm; +struct _mode_parameter_t modparm;clock_type_t clock;struct sm750_dev *sm750_dev;struct lynxfb_par *par;
Signature · 1 line
2.11.0