Staging: sm750fb: fix brace coding style issues
Subsystems (2)
PATCH 1/2 Staging: sm750fb: fix brace coding style issues
This is a patch to sm750fb that fixes brace coding style errors and warnings found by checkpatch.pl
--- drivers/staging/sm750fb/ddk750_chip.h | 12 ++--- drivers/staging/sm750fb/ddk750_display.c | 79 +++++++++++-------------------- drivers/staging/sm750fb/ddk750_display.h | 3 +- drivers/staging/sm750fb/ddk750_dvi.c | 6 +-- drivers/staging/sm750fb/ddk750_dvi.h | 3 +- drivers/staging/sm750fb/ddk750_hwi2c.c | 6 +-- drivers/staging/sm750fb/ddk750_mode.c | 19 +++----- drivers/staging/sm750fb/ddk750_mode.h | 6 +-- drivers/staging/sm750fb/ddk750_power.c | 31 ++++--------- drivers/staging/sm750fb/ddk750_power.h | 3 +- drivers/staging/sm750fb/ddk750_sii164.c | 16 ++----- drivers/staging/sm750fb/ddk750_sii164.h | 3 +- drivers/staging/sm750fb/ddk750_swi2c.c | 32 ++++--------- drivers/staging/sm750fb/sm750.h | 2 +- drivers/staging/sm750fb/sm750_accel.c | 51 +++++++------------- drivers/staging/sm750fb/sm750_cursor.c | 33 ++++++------- drivers/staging/sm750fb/sm750_hw.c | 80 ++++++++++++++------------------ 17 files changed, 140 insertions(+), 245 deletions(-)
drivers/staging/sm750fb/ddk750_chip.h +4 -8
@@ -8,8 +8,7 @@#include <linux/io.h> /* This is all the chips recognized by this library */ -typedef enum _logical_chip_type_t -{ +typedef enum _logical_chip_type_t { SM_UNKNOWN, SM718, SM750,
@@ -18,8 +17,7 @@ typedef enum _logical_chip_type_tlogical_chip_type_t ; -typedef enum _clock_type_t -{ +typedef enum _clock_type_t { MXCLK_PLL, PRIMARY_PLL, SECONDARY_PLL,
@@ -28,8 +26,7 @@ typedef enum _clock_type_t } clock_type_t; -typedef struct _pll_value_t -{ +typedef struct _pll_value_t { clock_type_t clockType; unsigned long inputFreq; /* Input clock frequency to the PLL */
@@ -42,8 +39,7 @@ typedef struct _pll_value_tpll_value_t ;/* input struct to initChipParam() function */ -typedef struct _initchip_param_t -{ +typedef struct _initchip_param_t { unsigned short powerMode; /* Use power mode 0 or 1 */ unsigned short chipClock; /* Speed of main chip clock in MHz unit 0 = keep the current clock setting
drivers/staging/sm750fb/ddk750_display.c +28 -51
193 lines not on this page · raw message
drivers/staging/sm750fb/ddk750_display.h +1 -2
@@ -86,8 +86,7 @@CRT means crt path DSUB */ #if 0 -typedef enum _disp_output_t -{ +typedef enum _disp_output_t { NO_DISPLAY = DPMS_OFF, LCD1_PRI = PNL_2_PRI|PRI_TP_ON|PNL_SEQ_ON|DPMS_OFF|DAC_ON,
drivers/staging/sm750fb/ddk750_dvi.c +2 -4
@@ -9,8 +9,7 @@/* This global variable contains all the supported driver and its corresponding function API. Please set the function pointer to NULL whenever the function is not supported. */ -static dvi_ctrl_device_t g_dcftSupportedDviController[] = -{ +static dvi_ctrl_device_t g_dcftSupportedDviController[] = { #ifdef DVI_CTRL_SII164 { .pfnInit = sii164InitChip,
@@ -45,8 +44,7 @@ int dviInit( {dvi_ctrl_device_t *pCurrentDviCtrl; pCurrentDviCtrl = g_dcftSupportedDviController; -if (pCurrentDviCtrl->pfnInit !=NULL ) - { +if (pCurrentDviCtrl->pfnInit !=NULL ) {return pCurrentDviCtrl->pfnInit (edgeSelect, busSelect, dualEdgeClkSelect, hsyncEnable, vsyncEnable, deskewEnable, deskewSetting, continuousSyncEnable, pllFilterEnable, pllFilterValue);
drivers/staging/sm750fb/ddk750_dvi.h +1 -2
@@ -27,8 +27,7 @@ typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void);/* Structure to hold all the function pointer to the DVI Controller. */ -typedef struct _dvi_ctrl_device_t -{ +typedef struct _dvi_ctrl_device_t { PFN_DVICTRL_INIT pfnInit; PFN_DVICTRL_RESETCHIP pfnResetChip; PFN_DVICTRL_GETCHIPSTRING pfnGetChipString;
drivers/staging/sm750fb/ddk750_hwi2c.c +2 -4
@@ -106,8 +106,7 @@ static unsigned int hwI2CWriteData(* Note: * Only 16 byte can be accessed per i2c start instruction. */ - do - { + do { /* Reset I2C by writing 0 to I2C_RESET register to clear the previous status. */ POKE32(I2C_RESET, 0);
@@ -173,8 +172,7 @@ static unsigned int hwI2CReadData(* Note: * Only 16 byte can be accessed per i2c start instruction. */ - do - { + do { /* Reset I2C by writing 0 to I2C_RESET register to clear all the status. */ POKE32(I2C_RESET, 0);
drivers/staging/sm750fb/ddk750_mode.c +7 -12
@@ -80,8 +80,7 @@ static int programModeRegisters(mode_parameter_t * pModeParam,pll_value_t * pll)int ret =0 ;int cnt =0 ;unsigned int ulTmpValue,ulReg; -if (pll->clockType ==SECONDARY_PLL ) - { +if (pll->clockType ==SECONDARY_PLL ) {/* programe secondary pixel clock */ POKE32 (CRT_PLL_CTRL ,formatPllReg (pll)); POKE32(CRT_HORIZONTAL_TOTAL,
@@ -107,9 +106,9 @@ static int programModeRegisters(mode_parameter_t * pModeParam,pll_value_t * pll)FIELD_SET (0 ,CRT_DISPLAY_CTRL ,PLANE ,ENABLE ); -if (getChipType () ==SM750LE ){ +if (getChipType () ==SM750LE ) {displayControlAdjust_SM750LE (pModeParam,ulTmpValue); - }else { + }else { ulReg =PEEK32 (CRT_DISPLAY_CTRL ) &FIELD_CLEAR (CRT_DISPLAY_CTRL ,VSYNC_PHASE ) &FIELD_CLEAR (CRT_DISPLAY_CTRL ,HSYNC_PHASE )
@@ -119,9 +118,7 @@ static int programModeRegisters(mode_parameter_t * pModeParam,pll_value_t * pll)POKE32 (CRT_DISPLAY_CTRL ,ulTmpValue|ulReg); } - } -else if (pll->clockType ==PRIMARY_PLL ) - { + }else if (pll->clockType ==PRIMARY_PLL ) {unsigned int ulReservedBits;POKE32 (PANEL_PLL_CTRL ,formatPllReg (pll));
@@ -170,16 +167,14 @@ static int programModeRegisters(mode_parameter_t * pModeParam,pll_value_t * pll)POKE32 (PANEL_DISPLAY_CTRL ,ulTmpValue|ulReg);#if 1 -while ((PEEK32 (PANEL_DISPLAY_CTRL ) & ~ulReservedBits) != (ulTmpValue|ulReg)) - { +while ((PEEK32 (PANEL_DISPLAY_CTRL ) & ~ulReservedBits) != (ulTmpValue|ulReg)) { cnt++;if (cnt >1000 )break ;POKE32 (PANEL_DISPLAY_CTRL ,ulTmpValue|ulReg); }#endif - } -else { + }else { ret =-1 ; }return ret;
@@ -193,7 +188,7 @@ int ddk750_setModeTiming(mode_parameter_t * parm,clock_type_t clock) pll.clockType = clock; uiActualPixelClk =calcPllValue (parm->pixel_clock,&pll); -if (getChipType () ==SM750LE ){ +if (getChipType () ==SM750LE ) {/* set graphic mode via IO method */ outb_p (0x88 ,0x3d4 );outb_p (0x06 ,0x3d5 );
drivers/staging/sm750fb/ddk750_mode.h +2 -4
@@ -3,16 +3,14 @@#include "ddk750_chip.h" -typedef enum _spolarity_t -{ +typedef enum _spolarity_t {POS =0 ,/* positive */ NEG ,/* negative */ }spolarity_t ; -typedef struct _mode_parameter_t -{ +typedef struct _mode_parameter_t { /* Horizontal timing. */ unsigned long horizontal_total; unsigned long horizontal_display_end;
drivers/staging/sm750fb/ddk750_power.c +10 -21
@@ -5,10 +5,10 @@void ddk750_setDPMS (DPMS_t state) {unsigned int value; -if (getChipType () ==SM750LE ){ +if (getChipType () ==SM750LE ) { value =PEEK32 (CRT_DISPLAY_CTRL );POKE32 (CRT_DISPLAY_CTRL ,FIELD_VALUE (value,CRT_DISPLAY_CTRL ,DPMS ,state)); - }else { + }else { value =PEEK32 (SYSTEM_CTRL ); value=FIELD_VALUE (value,SYSTEM_CTRL ,DPMS ,state);POKE32 (SYSTEM_CTRL , value);
@@ -36,8 +36,7 @@ void setPowerMode(unsigned int powerMode)if (getChipType () ==SM750LE )return ; -switch (powerMode) - { +switch (powerMode) {case POWER_MODE_CTRL_MODE_MODE0 : control_value =FIELD_SET (control_value,POWER_MODE_CTRL ,MODE ,MODE0 );break ;
@@ -55,16 +54,13 @@ void setPowerMode(unsigned int powerMode) }/* Set up other fields in Power Control Register */ -if (powerMode ==POWER_MODE_CTRL_MODE_SLEEP ) - { +if (powerMode ==POWER_MODE_CTRL_MODE_SLEEP ) { control_value =#ifdef VALIDATION_CHIP FIELD_SET( control_value, POWER_MODE_CTRL, 336CLK, OFF) | #endif FIELD_SET( control_value, POWER_MODE_CTRL, OSC_INPUT, OFF); - } -else - { + }else { control_value =#ifdef VALIDATION_CHIP FIELD_SET( control_value, POWER_MODE_CTRL, 336CLK, ON) |
@@ -84,8 +80,7 @@ void setCurrentGate(unsigned int gate)/* Get current power mode. */ mode =getPowerMode (); -switch (mode) - { +switch (mode) {case POWER_MODE_CTRL_MODE_MODE0 : gate_reg =MODE0_GATE ;break ;
@@ -111,13 +106,10 @@ void enable2DEngine(unsigned int enable)uint32_t gate; gate =PEEK32 (CURRENT_GATE ); -if (enable) - { +if (enable) { gate =FIELD_SET (gate,CURRENT_GATE ,DE ,ON ); gate =FIELD_SET (gate,CURRENT_GATE ,CSC ,ON ); - } -else - { + }else { gate =FIELD_SET (gate,CURRENT_GATE ,DE ,OFF ); gate =FIELD_SET (gate,CURRENT_GATE ,CSC ,OFF ); }
@@ -135,8 +127,7 @@ void enableZVPort(unsigned int enable)/* Enable ZV Port Gate */ gate =PEEK32 (CURRENT_GATE ); -if (enable) - { +if (enable) { gate =FIELD_SET (gate,CURRENT_GATE ,ZVPORT ,ON );#if 1 /* Using Software I2C */
@@ -145,9 +136,7 @@ void enableZVPort(unsigned int enable)/* Using Hardware I2C */ gate =FIELD_SET (gate,CURRENT_GATE ,I2C ,ON );#endif - } -else - { + }else {/* Disable ZV Port Gate. There is no way to know whether the GPIO pins are being used or not. Therefore, do not disable the GPIO gate. */ gate =FIELD_SET (gate,CURRENT_GATE ,ZVPORT ,OFF );
drivers/staging/sm750fb/ddk750_power.h +1 -2
@@ -1,8 +1,7 @@ #ifndef DDK750_POWER_H__ #define DDK750_POWER_H__ -typedef enum _DPMS_t -{ +typedef enum _DPMS_t { crtDPMS_ON = 0x0, crtDPMS_STANDBY = 0x1, crtDPMS_SUSPEND = 0x2,
drivers/staging/sm750fb/ddk750_sii164.c +5 -11
@@ -139,8 +139,7 @@ long sii164InitChip(#endif /* Check if SII164 Chip exists */ -if ((sii164GetVendorID () ==SII164_VENDOR_ID ) && (sii164GetDeviceID () ==SII164_DEVICE_ID )) - { +if ((sii164GetVendorID () ==SII164_VENDOR_ID ) && (sii164GetDeviceID () ==SII164_DEVICE_ID )) {#ifdef DDKDEBUG //sii164PrintRegisterValues();
@@ -190,8 +189,7 @@ long sii164InitChip(else config =SII164_DESKEW_ENABLE ; -switch (deskewSetting) - { +switch (deskewSetting) {case 0 : config |=SII164_DESKEW_1_STEP ;break ;
@@ -297,15 +295,12 @@ void sii164SetPower(unsigned char config; config =i2cReadReg (SII164_I2C_ADDRESS ,SII164_CONFIGURATION ); -if (powerUp ==1 ) - { +if (powerUp ==1 ) {/* Power up the chip */ config &= ~SII164_CONFIGURATION_POWER_MASK ; config |=SII164_CONFIGURATION_POWER_NORMAL ;i2cWriteReg (SII164_I2C_ADDRESS ,SII164_CONFIGURATION , config); - } -else - { + }else {/* Power down the chip */ config &= ~SII164_CONFIGURATION_POWER_MASK ; config |=SII164_CONFIGURATION_POWER_DOWN ;
@@ -325,8 +320,7 @@ static void sii164SelectHotPlugDetectionMode(unsigned char detectReg; detectReg =i2cReadReg (SII164_I2C_ADDRESS ,SII164_DETECT ) & ~SII164_DETECT_MONITOR_SENSE_OUTPUT_FLAG ; -switch (hotPlugMode) - { +switch (hotPlugMode) {case SII164_HOTPLUG_DISABLE : detectReg |=SII164_DETECT_MONITOR_SENSE_OUTPUT_HIGH ;break ;
drivers/staging/sm750fb/ddk750_sii164.h +1 -2
@@ -4,8 +4,7 @@#define USE_DVICHIP /* Hot Plug detection mode structure */ -typedef enum _sii164_hot_plug_mode_t -{ +typedef enum _sii164_hot_plug_mode_t { SII164_HOTPLUG_DISABLE = 0, /* Disable Hot Plug output bit (always high). */ SII164_HOTPLUG_USE_MDI, /* Use Monitor Detect Interrupt bit. */ SII164_HOTPLUG_USE_RSEN, /* Use Receiver Sense detect bit. */
drivers/staging/sm750fb/ddk750_swi2c.c +10 -22
@@ -100,8 +100,7 @@ static void swI2CWait(void)#else int i, Temp; -for (i=0 ; i<600 ; i++) - { +for (i=0 ; i<600 ; i++) { Temp = i; Temp += i; }
@@ -126,14 +125,11 @@ void swI2CSCL(unsigned char value)unsigned long ulGPIODirection; ulGPIODirection =PEEK32 (g_i2cClkGPIODataDirReg); -if (value)/* High */ - { +if (value) {/* High */ /* Set direction as input. This will automatically pull the signal up. */ ulGPIODirection &= ~(1 << g_i2cClockGPIO);POKE32 (g_i2cClkGPIODataDirReg, ulGPIODirection); - } -else /* Low */ - { + }else {/* Low */ /* Set the signal down */ ulGPIOData =PEEK32 (g_i2cClkGPIODataReg); ulGPIOData &= ~(1 << g_i2cClockGPIO);
@@ -163,14 +159,11 @@ void swI2CSDA(unsigned char value)unsigned long ulGPIODirection; ulGPIODirection =PEEK32 (g_i2cDataGPIODataDirReg); -if (value)/* High */ - { +if (value) {/* High */ /* Set direction as input. This will automatically pull the signal up. */ ulGPIODirection &= ~(1 << g_i2cDataGPIO);POKE32 (g_i2cDataGPIODataDirReg, ulGPIODirection); - } -else /* Low */ - { + }else {/* Low */ /* Set the signal down */ ulGPIOData =PEEK32 (g_i2cDataGPIODataReg); ulGPIOData &= ~(1 << g_i2cDataGPIO);
@@ -195,8 +188,7 @@ static unsigned char swI2CReadSDA(void)/* Make sure that the direction is input (High) */ ulGPIODirection =PEEK32 (g_i2cDataGPIODataDirReg); -if ((ulGPIODirection & (1 << g_i2cDataGPIO)) != (~(1 << g_i2cDataGPIO))) - { +if ((ulGPIODirection & (1 << g_i2cDataGPIO)) != (~(1 << g_i2cDataGPIO))) { ulGPIODirection &= ~(1 << g_i2cDataGPIO);POKE32 (g_i2cDataGPIODataDirReg, ulGPIODirection); }
@@ -255,8 +247,7 @@ static long swI2CWriteByte(unsigned char data)int i;/* Sending the data bit by bit */ -for (i=0 ; i<8 ; i++) - { +for (i=0 ; i<8 ; i++) {/* Set SCL to low */ swI2CSCL (0 );
@@ -286,8 +277,7 @@ static long swI2CWriteByte(unsigned char data)swI2CWait ();/* Read SDA, until SDA==0 */ -for (i=0 ; i<0xff ; i++) - { +for (i=0 ; i<0xff ; i++) {if (!swI2CReadSDA ())break ;
@@ -322,8 +312,7 @@ static unsigned char swI2CReadByte(unsigned char ack)int i;unsigned char data =0 ; -for (i=7 ; i>=0 ; i--) - { +for (i=7 ; i>=0 ; i--) {/* Set the SCL to Low and SDA to High (Input) */ swI2CSCL (0 );swI2CSDA (1 );
@@ -510,8 +499,7 @@ long swI2CWriteReg(*/ if ((swI2CWriteByte (deviceAddress) !=0 ) || (swI2CWriteByte (registerIndex) !=0 ) || - (swI2CWriteByte (data) !=0 )) - { + (swI2CWriteByte (data) !=0 )) { returnValue =-1 ; }
drivers/staging/sm750fb/sm750.h +1 -1
@@ -56,7 +56,7 @@ struct lynx_share{struct {int vram;int vram_added; - }mtrr; + } mtrr;#endif /* all smi graphic adaptor got below attributes */ unsigned long vidmem_start;
drivers/staging/sm750fb/sm750_accel.c +16 -35
137 lines not on this page · raw message
drivers/staging/sm750fb/sm750_cursor.c +14 -19
@@ -122,8 +122,7 @@ void hw_cursor_setData(struct lynx_cursor * cursor,odd=0; */ -for (i=0 ;i<count;i++) - { +for (i=0 ;i<count;i++) { color = *pcol++; mask = *pmsk++; data =0 ;
@@ -137,20 +136,19 @@ void hw_cursor_setData(struct lynx_cursor * cursor, else opr = mask & color; -for (j=0 ;j<8 ;j++) - { +for (j=0 ;j<8 ;j++) { -if (opr & (0x80 >> j)) - {//use fg color,id = 2 +if (opr & (0x80 >> j)) { +//use fg color,id = 2 data |=2 << (j*2 ); - }else { + }else {//use bg color,id = 1 data |=1 << (j*2 ); } }#else -for (j=0 ;j<8 ;j++){ -if (mask & (0x80 >>j)){ +for (j=0 ;j<8 ;j++) { +if (mask & (0x80 >>j)) {if (rop ==ROP_XOR ) opr = mask ^ color;else
@@ -173,7 +171,7 @@ void hw_cursor_setData(struct lynx_cursor * cursor,/* need a return */ pstart += offset; pbuffer = pstart; - }else { + }else { pbuffer +=sizeof (u16); }
@@ -204,8 +202,7 @@ void hw_cursor_setData2(struct lynx_cursor * cursor, pstart = cursor->vstart; pbuffer = pstart; -for (i=0 ;i<count;i++) - { +for (i=0 ;i<count;i++) { color = *pcol++; mask = *pmsk++; data =0 ;
@@ -217,19 +214,17 @@ void hw_cursor_setData2(struct lynx_cursor * cursor, else opr = mask & color; -for (j=0 ;j<8 ;j++) - { +for (j=0 ;j<8 ;j++) { -if (opr & (0x80 >> j)) - {//use fg color,id = 2 +if (opr & (0x80 >> j)) {//use fg color,id = 2 data |=2 << (j*2 ); - }else { + }else {//use bg color,id = 1 data |=1 << (j*2 ); } }#else -for (j=0 ;j<8 ;j++){ +for (j=0 ;j<8 ;j++) {if (mask & (1 <<j)) data |= ((color & (1 <<j))?1 :2 )<<(j*2 ); }
@@ -243,7 +238,7 @@ void hw_cursor_setData2(struct lynx_cursor * cursor,/* need a return */ pstart += offset; pbuffer = pstart; - }else { + }else { pbuffer +=sizeof (u16); }
drivers/staging/sm750fb/sm750_hw.c +35 -45
266 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH 2/2 Staging: sm750fb: Fix spelling error in TODO
Fixed spelling error in TODO.
--- drivers/staging/sm750fb/TODO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/sm750fb/TODO +1 -1
@@ -1,5 +1,5 @@ TODO: -- lots of clechpatch cleanup +- lots of checkpatch cleanup - use kernel coding style - refine the code and remove unused code - check on hardware effects of removal of USE_HW_I2C and USE_DVICHIP (these two
Signature · 1 line
2.1.4
Sudip Mukherjee
maintainerQuoted 1 line · Robin Karlsson
This is a patch to sm750fb that fixes brace coding style errors and warnings found by checkpatch.pl
Try to limit this commit message to 72 char.
You should usually use scripts/get_maintainer.pl to see where to send the mail.
Quoted 3 lines
Signed-off-by Robin Karlsson <[email protected]>---
<snip>
drivers/staging/sm750fb/sm750_cursor.c void hw_cursor_setData2(struct lynx_cursor * cursor, · line 219
Quoted 11 lines
drivers/staging/sm750fb/sm750_cursor.c +2
-4@@ -217,19 +214,17 @@ void hw_cursor_setData2(struct lynx_cursor * cursor,else opr = mask & color; -for (j=0 ;j<8 ;j++) - { +for (j=0 ;j<8 ;j++) { -if (opr & (0x80 >> j)) - {//use fg color,id = 2 +if (opr & (0x80 >> j)) {//use fg color,id = 2
this is introducing new checkpatch error.
Error: trailing statements should be on next line
regards
sudip
Quoted 1 line
(quoted diff) +0
-0data |= 2 << (j*2);