staging: ks7010: Fix coding style warning in ks7010_sdio.c
PATCH 1/5 staging: ks7010: Fix coding style warning in ks7010_sdio.c
This patch fixes the coding style warning ' braces {} are not necessary for single statement blocks' found by checkpatch.pl
Signed-off-by Sabitha George <[email protected]>
--- drivers/staging/ks7010/ks7010_sdio.c | 41 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 24 deletions(-)
drivers/staging/ks7010/ks7010_sdio.c +17 -24
@@ -159,9 +159,8 @@ void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv) rw_data =WAKEUP_REQ ; retval =ks7010_sdio_write (priv,WAKEUP , &rw_data,sizeof (rw_data)); -if (retval) { +if (retval)DPRINTK (1 ," error : WAKEUP=%02X\n" , rw_data); - }DPRINTK (4 ,"wake up : WAKEUP=%02X\n" , rw_data); priv->last_wakeup = jiffies; ++priv->wakeup_count;
@@ -402,9 +401,8 @@ static void rx_event_task(unsigned long dev)hostif_receive (priv, rp->data, rp->size);inc_rxqhead (priv); -if (cnt_rxqbody (priv) >0 ) { +if (cnt_rxqbody (priv) >0 )tasklet_schedule (&priv->ks_wlan_hw.rx_bh_task); - } }return ;
@@ -432,9 +430,8 @@ static void ks_wlan_hw_rx(void *dev, uint16_t size) retval =ks7010_sdio_read (priv,DATA_WINDOW , &rx_buffer->data[0 ],hif_align_size (size)); -if (retval) { +if (retval) goto error_out; - }/* length check */ if (size >2046 || size ==0 ) {
@@ -449,9 +446,8 @@ static void ks_wlan_hw_rx(void *dev, uint16_t size) retval =ks7010_sdio_write (priv,READ_STATUS , &read_status,sizeof (read_status)); -if (retval) { +if (retval)DPRINTK (1 ," error : READ_STATUS=%02X\n" , read_status); - } goto error_out; }
@@ -465,9 +461,8 @@ static void ks_wlan_hw_rx(void *dev, uint16_t size) retval =ks7010_sdio_write (priv,READ_STATUS , &read_status,sizeof (read_status)); -if (retval) { +if (retval)DPRINTK (1 ," error : READ_STATUS=%02X\n" , read_status); - }DPRINTK (4 ,"READ_STATUS=%02X\n" , read_status);if (atomic_read (&priv->psstatus.confirm_wait)) {
@@ -547,13 +542,12 @@ static void ks7010_rw_function(struct work_struct *work) }DPRINTK (4 ,"WSTATUS_RSIZE=%02X\n" , rw_data); -if (rw_data &RSIZE_MASK ) {/* Read schedule */ +if (rw_data &RSIZE_MASK )/* Read schedule */ ks_wlan_hw_rx ((void *)priv, (uint16_t ) (((rw_data &RSIZE_MASK ) <<4 ))); - } -if ((rw_data &WSTATUS_MASK )) { + +if ((rw_data &WSTATUS_MASK ))tx_device_task ((void *)priv); - }_ks_wlan_hw_power_save (priv); err_out:
@@ -903,9 +897,8 @@ static void ks7010_card_init(struct ks_wlan_private *priv)DPRINTK (1 ,"wait time out!! SME_START\n" ); } -if (priv->mac_address_valid && priv->version_size) { +if (priv->mac_address_valid && priv->version_size) priv->dev_state =DEVICE_STATE_PREINIT ; - }hostif_sme_enqueue (priv,SME_GET_EEPROM_CKSUM );
@@ -1048,9 +1041,9 @@ static int ks7010_sdio_probe(struct sdio_func *func,init_completion (&priv->ks_wlan_hw.ks7010_sdio_wait); priv->ks_wlan_hw.read_buf =NULL ; priv->ks_wlan_hw.read_buf =kmalloc (RX_DATA_SIZE ,GFP_KERNEL ); -if (!priv->ks_wlan_hw.read_buf) { +if (!priv->ks_wlan_hw.read_buf) goto error_free_netdev; - } + priv->dev_state =DEVICE_STATE_PREBOOT ; priv->net_dev = netdev; priv->firmware_version[0 ] ='\0' ;
@@ -1086,9 +1079,9 @@ static int ks7010_sdio_probe(struct sdio_func *func,sdio_claim_host (func); ret =ks7010_sdio_write (priv,INT_PENDING , &rw_data,sizeof (rw_data));sdio_release_host (func); -if (ret) { +if (ret)DPRINTK (1 ," error : INT_PENDING=%02X\n" , rw_data); - } +DPRINTK (4 ," clear Interrupt : INT_PENDING=%02X\n" , rw_data);/* enable ks7010sdio interrupt (INT_GCR_B|INT_READ_STATUS|INT_WRITE_STATUS) */
@@ -1096,9 +1089,9 @@ static int ks7010_sdio_probe(struct sdio_func *func,sdio_claim_host (func); ret =ks7010_sdio_write (priv,INT_ENABLE , &rw_data,sizeof (rw_data));sdio_release_host (func); -if (ret) { +if (ret)DPRINTK (1 ," error : INT_ENABLE=%02X\n" , rw_data); - } +DPRINTK (4 ," enable Interrupt : INT_ENABLE=%02X\n" , rw_data); priv->dev_state =DEVICE_STATE_BOOT ;
@@ -1199,9 +1192,9 @@ static void ks7010_sdio_remove(struct sdio_func *func)unregister_netdev (netdev);trx_device_exit (priv); -if (priv->ks_wlan_hw.read_buf) { +if (priv->ks_wlan_hw.read_buf)kfree (priv->ks_wlan_hw.read_buf); - } +free_netdev (priv->net_dev); card->priv =NULL ; }
Signature · 1 line
1.9.1
Greg KH
maintainerQuoted 7 lines · Sabitha George
This patch fixes the coding style warning ' braces {} are not necessary for single statement blocks' found by checkpatch.pl
Signed-off-by Sabitha George <[email protected]>--- drivers/staging/ks7010/ks7010_sdio.c | 41 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 24 deletions(-)
This patch doesn't apply, so please refresh this series against my latest tree and resend.
thanks,
greg k-h