Commit f782497c authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: fix line over 80 chars in wilc_wlan_handle_txq()

Fix "line over 80 characters" issue reported by checkpatch.pl script.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 552699bc
...@@ -576,6 +576,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -576,6 +576,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
u32 vmm_table[WILC_VMM_TBL_SIZE]; u32 vmm_table[WILC_VMM_TBL_SIZE];
struct wilc_vif *vif; struct wilc_vif *vif;
struct wilc *wilc; struct wilc *wilc;
const struct wilc_hif_func *func;
vif = netdev_priv(dev); vif = netdev_priv(dev);
wilc = vif->wilc; wilc = vif->wilc;
...@@ -629,10 +630,9 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -629,10 +630,9 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
acquire_bus(wilc, ACQUIRE_AND_WAKEUP); acquire_bus(wilc, ACQUIRE_AND_WAKEUP);
counter = 0; counter = 0;
func = wilc->hif_func;
do { do {
ret = wilc->hif_func->hif_read_reg(wilc, ret = func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, &reg);
WILC_HOST_TX_CTRL,
&reg);
if (!ret) if (!ret)
break; break;
...@@ -642,7 +642,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -642,7 +642,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
counter++; counter++;
if (counter > 200) { if (counter > 200) {
counter = 0; counter = 0;
ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_TX_CTRL, 0); ret = func->hif_write_reg(wilc,
WILC_HOST_TX_CTRL, 0);
break; break;
} }
} while (!wilc->quit); } while (!wilc->quit);
...@@ -652,18 +653,21 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -652,18 +653,21 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
timeout = 200; timeout = 200;
do { do {
ret = wilc->hif_func->hif_block_tx(wilc, WILC_VMM_TBL_RX_SHADOW_BASE, (u8 *)vmm_table, ((i + 1) * 4)); ret = func->hif_block_tx(wilc,
WILC_VMM_TBL_RX_SHADOW_BASE,
(u8 *)vmm_table,
((i + 1) * 4));
if (!ret) if (!ret)
break; break;
ret = wilc->hif_func->hif_write_reg(wilc, ret = func->hif_write_reg(wilc, WILC_HOST_VMM_CTL, 0x2);
WILC_HOST_VMM_CTL,
0x2);
if (!ret) if (!ret)
break; break;
do { do {
ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_VMM_CTL, &reg); ret = func->hif_read_reg(wilc,
WILC_HOST_VMM_CTL,
&reg);
if (!ret) if (!ret)
break; break;
if ((reg >> 2) & 0x1) { if ((reg >> 2) & 0x1) {
...@@ -673,7 +677,9 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -673,7 +677,9 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
release_bus(wilc, RELEASE_ALLOW_SLEEP); release_bus(wilc, RELEASE_ALLOW_SLEEP);
} while (--timeout); } while (--timeout);
if (timeout <= 0) { if (timeout <= 0) {
ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_VMM_CTL, 0x0); ret = func->hif_write_reg(wilc,
WILC_HOST_VMM_CTL,
0x0);
break; break;
} }
...@@ -681,11 +687,15 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -681,11 +687,15 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
break; break;
if (entries == 0) { if (entries == 0) {
ret = wilc->hif_func->hif_read_reg(wilc, WILC_HOST_TX_CTRL, &reg); ret = func->hif_read_reg(wilc,
WILC_HOST_TX_CTRL,
&reg);
if (!ret) if (!ret)
break; break;
reg &= ~BIT(0); reg &= ~BIT(0);
ret = wilc->hif_func->hif_write_reg(wilc, WILC_HOST_TX_CTRL, reg); ret = func->hif_write_reg(wilc,
WILC_HOST_TX_CTRL,
reg);
if (!ret) if (!ret)
break; break;
break; break;
...@@ -753,11 +763,11 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -753,11 +763,11 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
acquire_bus(wilc, ACQUIRE_AND_WAKEUP); acquire_bus(wilc, ACQUIRE_AND_WAKEUP);
ret = wilc->hif_func->hif_clear_int_ext(wilc, ENABLE_TX_VMM); ret = func->hif_clear_int_ext(wilc, ENABLE_TX_VMM);
if (!ret) if (!ret)
goto _end_; goto _end_;
ret = wilc->hif_func->hif_block_tx_ext(wilc, 0, txb, offset); ret = func->hif_block_tx_ext(wilc, 0, txb, offset);
if (!ret) if (!ret)
goto _end_; goto _end_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment