aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/3945.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-02-13 05:23:28 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-22 14:51:17 -0500
commitd87c771f47460f7ca943942d508f2b9bd223a7e0 (patch)
treec0f78228a28123beafcfe501f661d64653f65c74 /drivers/net/wireless/iwlegacy/3945.c
parent3976b4519458b27753196e63c89b2a774129e19a (diff)
iwlegacy: small queue initializations cleanup
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945.c')
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 103251dba459..8900e3c42b02 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -790,7 +790,6 @@ il3945_rx_init(struct il_priv *il, struct il_rx_queue *rxq)
790static int 790static int
791il3945_tx_reset(struct il_priv *il) 791il3945_tx_reset(struct il_priv *il)
792{ 792{
793
794 /* bypass mode */ 793 /* bypass mode */
795 il_wr_prph(il, ALM_SCD_MODE_REG, 0x2); 794 il_wr_prph(il, ALM_SCD_MODE_REG, 0x2);
796 795
@@ -827,8 +826,7 @@ il3945_tx_reset(struct il_priv *il)
827static int 826static int
828il3945_txq_ctx_reset(struct il_priv *il) 827il3945_txq_ctx_reset(struct il_priv *il)
829{ 828{
830 int rc; 829 int rc, txq_id;
831 int txq_id, slots_num;
832 830
833 il3945_hw_txq_ctx_free(il); 831 il3945_hw_txq_ctx_free(il);
834 832
@@ -844,10 +842,7 @@ il3945_txq_ctx_reset(struct il_priv *il)
844 842
845 /* Tx queue(s) */ 843 /* Tx queue(s) */
846 for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) { 844 for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) {
847 slots_num = 845 rc = il_tx_queue_init(il, txq_id);
848 (txq_id ==
849 IL39_CMD_QUEUE_NUM) ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
850 rc = il_tx_queue_init(il, &il->txq[txq_id], slots_num, txq_id);
851 if (rc) { 846 if (rc) {
852 IL_ERR("Tx %d queue init failed\n", txq_id); 847 IL_ERR("Tx %d queue init failed\n", txq_id);
853 goto error; 848 goto error;