Staging: crystalhd: fixed white spaces and brace coding in crystalhd_hw.c This is a patch to the crystalhd_hw.c file that fixes up a white space and brace warnings found by the checkpatch.pl tool Signed-off-by: Tomas Dabasinskas <[email protected]>
PATCH 1/1 Staging: crystalhd: fixed white spaces and brace coding in crystalhd_hw.c This is a patch to the crystalhd_hw.c file that fixes up a white space and brace warnings found by the checkpatch.pl tool Signed-off-by: Tomas Dabasinskas <[email protected]>
--- drivers/staging/crystalhd/crystalhd_hw.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-)
drivers/staging/crystalhd/crystalhd_hw.c +12 -17
@@ -431,7 +431,7 @@ static void crystalhd_hw_delete_ioqs(struct crystalhd_hw *hw)if (!hw)return ; -BCMLOG (BCMLOG_DBG ,"Deleting IOQs \n" ); +BCMLOG (BCMLOG_DBG ,"Deleting IOQs\n" );crystalhd_hw_delete_ioq (hw->adp, hw->tx_actq);crystalhd_hw_delete_ioq (hw->adp, hw->tx_freeq);crystalhd_hw_delete_ioq (hw->adp, hw->rx_actq);
@@ -569,7 +569,7 @@ static bool crystalhd_tx_list0_handler(struct crystalhd_hw *hw, uint32_t err_stsif (!(err_sts & err_mask))return false; -BCMLOG_ERR ("Error on Tx-L0 %x \n" , err_sts); +BCMLOG_ERR ("Error on Tx-L0 %x\n" , err_sts); tmp = err_mask;
@@ -601,7 +601,7 @@ static bool crystalhd_tx_list1_handler(struct crystalhd_hw *hw, uint32_t err_stsif (!(err_sts & err_mask))return false; -BCMLOG_ERR ("Error on Tx-L1 %x \n" , err_sts); +BCMLOG_ERR ("Error on Tx-L1 %x\n" , err_sts); tmp = err_mask;
@@ -634,9 +634,9 @@ static void crystalhd_tx_isr(struct crystalhd_hw *hw, uint32_t int_sts) BC_STS_SUCCESS);if (!(int_sts & (INTR_INTR_STATUS_L0_TX_DMA_ERR_INTR_MASK | -INTR_INTR_STATUS_L1_TX_DMA_ERR_INTR_MASK ))) { -/* No error mask set.. */ -return ; +INTR_INTR_STATUS_L1_TX_DMA_ERR_INTR_MASK ))) { +/* No error mask set.. */ +return ; }/* Handle Tx errors. */
@@ -1133,33 +1133,29 @@ static void crystalhd_stop_rx_dma_engine(struct crystalhd_hw *hw)if (l0y) { l0y =crystalhd_reg_rd (hw->adp,MISC1_Y_RX_FIRST_DESC_L_ADDR_LIST0 ); l0y &=DMA_START_BIT ; -if (!l0y) { +if (!l0y) hw->rx_list_sts[0 ] &= ~rx_waiting_y_intr; - } }if (l1y) { l1y =crystalhd_reg_rd (hw->adp,MISC1_Y_RX_FIRST_DESC_L_ADDR_LIST1 ); l1y &=DMA_START_BIT ; -if (!l1y) { +if (!l1y) hw->rx_list_sts[1 ] &= ~rx_waiting_y_intr; - } }if (l0uv) { l0uv =crystalhd_reg_rd (hw->adp,MISC1_UV_RX_FIRST_DESC_L_ADDR_LIST0 ); l0uv &=DMA_START_BIT ; -if (!l0uv) { +if (!l0uv) hw->rx_list_sts[0 ] &= ~rx_waiting_uv_intr; - } }if (l1uv) { l1uv =crystalhd_reg_rd (hw->adp,MISC1_UV_RX_FIRST_DESC_L_ADDR_LIST1 ); l1uv &=DMA_START_BIT ; -if (!l1uv) { +if (!l1uv) hw->rx_list_sts[1 ] &= ~rx_waiting_uv_intr; - } }msleep_interruptible (100 ); count--;
@@ -1431,9 +1427,8 @@ static bool crystalhd_rx_list1_handler(struct crystalhd_hw *hw, uint32_t int_sts/* UV1 - DMA */ tmp = uv_err_sts &GET_UV1_ERR_MSK ; -if (int_sts &INTR_INTR_STATUS_L1_UV_RX_DMA_DONE_INTR_MASK ) { +if (int_sts &INTR_INTR_STATUS_L1_UV_RX_DMA_DONE_INTR_MASK ) hw->rx_list_sts[1 ] &= ~rx_waiting_uv_intr; - }if (uv_err_sts &MISC1_UV_RX_ERROR_STATUS_RX_L1_UNDERRUN_ERROR_MASK ) { hw->rx_list_sts[1 ] &= ~rx_waiting_uv_intr;
@@ -1739,7 +1734,7 @@ BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw, BC_FW_CMD *fw_cmd) res_buff = fw_cmd->rsp;if (!cmd_buff || !res_buff) { -BCMLOG_ERR ("Invalid Parameters for F/W Command \n" ); +BCMLOG_ERR ("Invalid Parameters for F/W Command\n" );return BC_STS_INV_ARG ; }
Signature · 1 line
1.6.3.3
Re: [PATCH] Staging: crystalhd: fixed white spaces and brace coding in crystalhd_hw.c
Quoted 4 lines · Tomas Dabasinskas
This is a patch to the
crystalhd_hw.cfile that fixes up a white space and brace warnings found by the checkpatch.pl toolSigned-off-by Tomas Dabasinskas <[email protected]>
Acked-by Jarod Wilson <[email protected]>
Although, ultimately, I'm planning to replace all the BCMLOG bits anyway with dev_foo printk wrappers. Just haven't had time to yet.
--jarod
Quoted 17 lines
--- drivers/staging/crystalhd/crystalhd_hw.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-)drivers/staging/crystalhd/crystalhd_hw.c +1
-1@@ -431,7 +431,7 @@ static void crystalhd_hw_delete_ioqs(struct crystalhd_hw *hw)if (!hw)return ; -BCMLOG (BCMLOG_DBG ,"Deleting IOQs \n" ); +BCMLOG (BCMLOG_DBG ,"Deleting IOQs\n" );crystalhd_hw_delete_ioq (hw->adp, hw->tx_actq);crystalhd_hw_delete_ioq (hw->adp, hw->tx_freeq);crystalhd_hw_delete_ioq (hw->adp, hw->rx_actq);
...
Signature · 2 lines
Jarod Wilson [email protected]