diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-tx.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-tx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c index 22617c47fc77..cfc015ae203b 100644 --- a/drivers/net/wireless/iwlegacy/iwl-tx.c +++ b/drivers/net/wireless/iwlegacy/iwl-tx.c | |||
@@ -299,7 +299,7 @@ static int il_tx_queue_alloc(struct il_priv *il, | |||
299 | txq->txb = kzalloc(sizeof(txq->txb[0]) * | 299 | txq->txb = kzalloc(sizeof(txq->txb[0]) * |
300 | TFD_QUEUE_SIZE_MAX, GFP_KERNEL); | 300 | TFD_QUEUE_SIZE_MAX, GFP_KERNEL); |
301 | if (!txq->txb) { | 301 | if (!txq->txb) { |
302 | IL_ERR(il, "kmalloc for auxiliary BD " | 302 | IL_ERR("kmalloc for auxiliary BD " |
303 | "structures failed\n"); | 303 | "structures failed\n"); |
304 | goto error; | 304 | goto error; |
305 | } | 305 | } |
@@ -312,7 +312,7 @@ static int il_tx_queue_alloc(struct il_priv *il, | |||
312 | txq->tfds = dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr, | 312 | txq->tfds = dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr, |
313 | GFP_KERNEL); | 313 | GFP_KERNEL); |
314 | if (!txq->tfds) { | 314 | if (!txq->tfds) { |
315 | IL_ERR(il, "pci_alloc_consistent(%zd) failed\n", tfd_sz); | 315 | IL_ERR("pci_alloc_consistent(%zd) failed\n", tfd_sz); |
316 | goto error; | 316 | goto error; |
317 | } | 317 | } |
318 | txq->q.id = id; | 318 | txq->q.id = id; |
@@ -461,7 +461,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd) | |||
461 | BUG_ON(fix_size > IL_MAX_CMD_SIZE); | 461 | BUG_ON(fix_size > IL_MAX_CMD_SIZE); |
462 | 462 | ||
463 | if (il_is_rfkill(il) || il_is_ctkill(il)) { | 463 | if (il_is_rfkill(il) || il_is_ctkill(il)) { |
464 | IL_WARN(il, "Not sending command - %s KILL\n", | 464 | IL_WARN("Not sending command - %s KILL\n", |
465 | il_is_rfkill(il) ? "RF" : "CT"); | 465 | il_is_rfkill(il) ? "RF" : "CT"); |
466 | return -EIO; | 466 | return -EIO; |
467 | } | 467 | } |
@@ -471,7 +471,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd) | |||
471 | if (il_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) { | 471 | if (il_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) { |
472 | spin_unlock_irqrestore(&il->hcmd_lock, flags); | 472 | spin_unlock_irqrestore(&il->hcmd_lock, flags); |
473 | 473 | ||
474 | IL_ERR(il, "Restarting adapter due to command queue full\n"); | 474 | IL_ERR("Restarting adapter due to command queue full\n"); |
475 | queue_work(il->workqueue, &il->restart); | 475 | queue_work(il->workqueue, &il->restart); |
476 | return -ENOSPC; | 476 | return -ENOSPC; |
477 | } | 477 | } |
@@ -566,7 +566,7 @@ static void il_hcmd_queue_reclaim(struct il_priv *il, int txq_id, | |||
566 | int nfreed = 0; | 566 | int nfreed = 0; |
567 | 567 | ||
568 | if ((idx >= q->n_bd) || (il_queue_used(q, idx) == 0)) { | 568 | if ((idx >= q->n_bd) || (il_queue_used(q, idx) == 0)) { |
569 | IL_ERR(il, "Read index for DMA queue txq id (%d), index %d, " | 569 | IL_ERR("Read index for DMA queue txq id (%d), index %d, " |
570 | "is out of range [0-%d] %d %d.\n", txq_id, | 570 | "is out of range [0-%d] %d %d.\n", txq_id, |
571 | idx, q->n_bd, q->write_ptr, q->read_ptr); | 571 | idx, q->n_bd, q->write_ptr, q->read_ptr); |
572 | return; | 572 | return; |
@@ -576,7 +576,7 @@ static void il_hcmd_queue_reclaim(struct il_priv *il, int txq_id, | |||
576 | q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd)) { | 576 | q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd)) { |
577 | 577 | ||
578 | if (nfreed++ > 0) { | 578 | if (nfreed++ > 0) { |
579 | IL_ERR(il, "HCMD skipped: index (%d) %d %d\n", idx, | 579 | IL_ERR("HCMD skipped: index (%d) %d %d\n", idx, |
580 | q->write_ptr, q->read_ptr); | 580 | q->write_ptr, q->read_ptr); |
581 | queue_work(il->workqueue, &il->restart); | 581 | queue_work(il->workqueue, &il->restart); |
582 | } | 582 | } |