Staging: crystalhd: fix brace and whitespace coding style issue in crystalhd_hw.c
PATCH 1/1 Staging: crystalhd: fix brace and whitespace coding style issue in crystalhd_hw.c
Quoted 1 line
From
33c0dbc048046e0666926de47a74d8870e3d4099Mon Sep 17 00:00:00 2001
From: coach <coach@GentooBox.(none)>
Date: Thu, 11 Mar 2010 20:42:18 +0100
Subject: [PATCH] Staging: crystalhd: fix brace and whitespace coding style issue in crystalhd_hw.c
This is a patch to the crystalhd_hw.c file that fixes up some brace and whitespace warnings found by the checkpatch.pl tool
--- drivers/staging/crystalhd/crystalhd_hw.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-)
drivers/staging/crystalhd/crystalhd_hw.c +9 -14
@@ -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;
@@ -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.4.4
Quoted 6 lines · Niklas Gottschalk
Quoted 1 line
From
33c0dbc048046e0666926de47a74d8870e3d4099Mon Sep 17 00:00:00 2001From: coach <coach@GentooBox.(none)>
Date: Thu, 11 Mar 2010 20:42:18 +0100
Subject: [PATCH] Staging: crystalhd: fix brace and whitespace coding style issue incrystalhd_hw.c
This is a patch to thecrystalhd_hw.cfile that fixes up some brace and whitespace warnings found by the checkpatch.pl toolSigned-off-by Niklas Gottschalk <[email protected]>
Sorry, but someone else already sent in this patch.
greg k-h