Minor style issue fixes for staging/kpc2000
cover Minor style issue fixes for staging/kpc2000
Hi,
Here are some fixes for minor space, parenthese and brace issues in kpc2000 reported by checkpatch.pl.
- Simon
Simon Sandström (4):
staging: kpc2000: add missing spaces in kpc2000_i2c.c
staging: kpc2000: add missing spaces in kpc2000_spi.c
staging: kpc2000: remove unnecessary parentheses in kpc2000_spi.c
staging: kpc2000: fix brace issues in kpc2000_spi.c
drivers/staging/kpc2000/kpc2000_i2c.c | 6 +++--- drivers/staging/kpc2000/kpc2000_spi.c | 18 ++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/4 staging: kpc2000: add missing spaces in kpc2000_i2c.c
Fixes checkpatch "CHECK: spaces preferred around that '+' (ctx:VxV)".
--- drivers/staging/kpc2000/kpc2000_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/kpc2000/kpc2000_i2c.c +3 -3
@@ -257,7 +257,7 @@ static int i801_block_transaction_by_block(struct i2c_device *priv, union i2c_sm len = data->block[0 ];outb_p (len,SMBHSTDAT0 (priv));for (i =0 ; i < len; i++) -outb_p (data->block[i+1 ],SMBBLKDAT (priv)); +outb_p (data->block[i +1 ],SMBBLKDAT (priv)); } status =i801_transaction (priv,I801_BLOCK_DATA |ENABLE_INT9 |I801_PEC_EN * hwpec);
@@ -337,8 +337,8 @@ static int i801_block_transaction_byte_by_byte(struct i2c_device *priv, union i2/* Retrieve/store value in SMBBLKDAT */ if (read_write ==I2C_SMBUS_READ ) data->block[i] =inb_p (SMBBLKDAT (priv)); -if (read_write ==I2C_SMBUS_WRITE && i+1 <= len) -outb_p (data->block[i+1 ],SMBBLKDAT (priv)); +if (read_write ==I2C_SMBUS_WRITE && i +1 <= len) +outb_p (data->block[i +1 ],SMBBLKDAT (priv));/* signals SMBBLKDAT ready */ outb_p (SMBHSTSTS_BYTE_DONE |SMBHSTSTS_INTR ,SMBHSTSTS (priv)); }
Signature · 1 line
2.20.1
PATCH 2/4 staging: kpc2000: add missing spaces in kpc2000_spi.c
In reply to Simon SandströmFixes checkpatch errors:
- spaces required around that '=' (ctx:VxV)
- space required before the open parenthesis '('
- spaces preferred around that '-' (ctx:VxV)
- space required before the open brace '{'
--- drivers/staging/kpc2000/kpc2000_spi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/kpc2000/kpc2000_spi.c +7 -7
@@ -164,7 +164,7 @@ kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx)u64 val; addr += idx; -if ((idx ==KP_SPI_REG_CONFIG ) && (cs->conf_cache >=0 )){ +if ((idx ==KP_SPI_REG_CONFIG ) && (cs->conf_cache >=0 )) {return cs->conf_cache; } val =readq (addr);
@@ -223,9 +223,9 @@ kp_spi_txrx_pio(struct spi_device *spidev, struct spi_transfer *transfer) processed++; } } -else if (rx) { +else if (rx) {for (i =0 ; i < c ; i++) { -char test=0 ; +char test =0 ;kp_spi_write_reg (cs,KP_SPI_REG_TXDATA ,0x00 );
@@ -261,7 +261,7 @@ kp_spi_setup(struct spi_device *spidev) cs = spidev->controller_state;if (!cs) { cs =kzalloc (sizeof (*cs),GFP_KERNEL ); -if (!cs) { +if (!cs) {return -ENOMEM ; } cs->base = kpspi->base;
@@ -364,7 +364,7 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)if (transfer->bits_per_word) { word_len = transfer->bits_per_word; } - sc.bitfield.wl = word_len-1 ; + sc.bitfield.wl = word_len -1 ;/* ...chip select */ sc.bitfield.cs = spidev->chip_select;
@@ -425,7 +425,7 @@ kp_spi_probe(struct platform_device *pldev)int i; drvdata = pldev->dev.platform_data; -if (!drvdata){ +if (!drvdata) {dev_err (&pldev->dev,"kp_spi_probe: platform_data is NULL!\n" );return -ENODEV ; }
@@ -476,7 +476,7 @@ kp_spi_probe(struct platform_device *pldev)spi_new_device (master, &(table[i])); \ } -switch ((drvdata->card_id &0xFFFF0000 ) >>16 ){ +switch ((drvdata->card_id &0xFFFF0000 ) >>16 ) {case PCI_DEVICE_ID_DAKTRONICS_KADOKA_P2KR0 :NEW_SPI_DEVICE_FROM_BOARD_INFO_TABLE (p2kr0_board_info);break ;
Signature · 1 line
2.20.1
PATCH 3/4 staging: kpc2000: remove unnecessary parentheses in kpc2000_spi.c
In reply to Simon SandströmFixes checkpatch "CHECK: Unnecessary parentheses around '...'".
--- drivers/staging/kpc2000/kpc2000_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/kpc2000/kpc2000_spi.c +1 -1
@@ -164,7 +164,7 @@ kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx)u64 val; addr += idx; -if ((idx ==KP_SPI_REG_CONFIG ) && (cs->conf_cache >=0 )) { +if (idx ==KP_SPI_REG_CONFIG && cs->conf_cache >=0 ) {return cs->conf_cache; } val =readq (addr);
Signature · 1 line
2.20.1
Greg KH
maintainerRe: [PATCH 3/4] staging: kpc2000: remove unnecessary parentheses in kpc2000_spi.c
Quoted 12 lines · Simon Sandström
Fixes checkpatch "CHECK: Unnecessary parentheses around '...'".
Signed-off-by Simon Sandström <[email protected]>--- drivers/staging/kpc2000/kpc2000_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/kpc2000/kpc2000_spi.c +0
-0
drivers/staging/kpc2000/kpc2000_spi.c kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx) · line 167
Quoted 5 lines
drivers/staging/kpc2000/kpc2000_spi.c +1
-1@@ -164,7 +164,7 @@ kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx)u64 val; addr += idx; -if ((idx ==KP_SPI_REG_CONFIG ) && (cs->conf_cache >=0 )) { +if (idx ==KP_SPI_REG_CONFIG && cs->conf_cache >=0 ) {
Ick, no. I don't want to have to remember the priority order of operations. Leave this as-is, I HATE this checkpatch message.
thanks,
greg k-h
PATCH 4/4 staging: kpc2000: fix brace issues in kpc2000_spi.c
In reply to Simon SandströmFixes checkpatch errors: "else should follow close brace '}'" and "braces {} are not necessary for single statement blocks".
--- drivers/staging/kpc2000/kpc2000_spi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/kpc2000/kpc2000_spi.c +4 -6
@@ -164,9 +164,9 @@ kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx)u64 val; addr += idx; -if (idx ==KP_SPI_REG_CONFIG && cs->conf_cache >=0 ) { +if (idx ==KP_SPI_REG_CONFIG && cs->conf_cache >=0 )return cs->conf_cache; - } + val =readq (addr);return val; }
@@ -222,8 +222,7 @@ kp_spi_txrx_pio(struct spi_device *spidev, struct spi_transfer *transfer)kp_spi_write_reg (cs,KP_SPI_REG_TXDATA , val); processed++; } - } -else if (rx) { + }else if (rx) {for (i =0 ; i < c ; i++) {char test =0 ;
@@ -261,9 +260,8 @@ kp_spi_setup(struct spi_device *spidev) cs = spidev->controller_state;if (!cs) { cs =kzalloc (sizeof (*cs),GFP_KERNEL ); -if (!cs) { +if (!cs)return -ENOMEM ; - } cs->base = kpspi->base; cs->conf_cache =-1 ; spidev->controller_state = cs;
Signature · 1 line
2.20.1