aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2100.c
diff options
context:
space:
mode:
authorJiri Benc <jbenc@suse.cz>2005-08-25 20:03:27 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-25 20:03:27 -0400
commit797b4f7652a4dcf06bdf6a8c870991acdf56c03d (patch)
tree8f948ed3592fe9e4f726955f4d1e217af00622a7 /drivers/net/wireless/ipw2100.c
parent19f7f74297e7f88f60c183acb105a5488dd189b6 (diff)
ipw2100: remove custom debug-print macros
From: Pavel Machek <pavel@ucw.cz> ipw2100 uses custom debug prints that are sometimes longer and always harder to read than normal printk. They also introduced some bugs where prefix is printed twice. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Jiri Benc <jbenc@suse.cz>
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
-rw-r--r--drivers/net/wireless/ipw2100.c90
1 files changed, 45 insertions, 45 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 41f25e51300e..1ff41afa4214 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -484,7 +484,7 @@ int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
484 u32 total_length; 484 u32 total_length;
485 485
486 if (ordinals->table1_addr == 0) { 486 if (ordinals->table1_addr == 0) {
487 IPW_DEBUG_WARNING(DRV_NAME ": attempt to use fw ordinals " 487 printk(KERN_WARNING DRV_NAME ": attempt to use fw ordinals "
488 "before they have been loaded.\n"); 488 "before they have been loaded.\n");
489 return -EINVAL; 489 return -EINVAL;
490 } 490 }
@@ -493,7 +493,7 @@ int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
493 if (*len < IPW_ORD_TAB_1_ENTRY_SIZE) { 493 if (*len < IPW_ORD_TAB_1_ENTRY_SIZE) {
494 *len = IPW_ORD_TAB_1_ENTRY_SIZE; 494 *len = IPW_ORD_TAB_1_ENTRY_SIZE;
495 495
496 IPW_DEBUG_WARNING(DRV_NAME 496 printk(KERN_WARNING DRV_NAME
497 ": ordinal buffer length too small, need %zd\n", 497 ": ordinal buffer length too small, need %zd\n",
498 IPW_ORD_TAB_1_ENTRY_SIZE); 498 IPW_ORD_TAB_1_ENTRY_SIZE);
499 499
@@ -546,7 +546,7 @@ int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
546 return 0; 546 return 0;
547 } 547 }
548 548
549 IPW_DEBUG_WARNING(DRV_NAME ": ordinal %d neither in table 1 nor " 549 printk(KERN_WARNING DRV_NAME ": ordinal %d neither in table 1 nor "
550 "in table 2\n", ord); 550 "in table 2\n", ord);
551 551
552 return -EINVAL; 552 return -EINVAL;
@@ -761,7 +761,7 @@ static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
761 } 761 }
762 762
763 if (priv->fatal_error) { 763 if (priv->fatal_error) {
764 IPW_DEBUG_WARNING("%s: firmware fatal error\n", 764 printk(KERN_WARNING DRV_NAME ": %s: firmware fatal error\n",
765 priv->net_dev->name); 765 priv->net_dev->name);
766 return -EIO; 766 return -EIO;
767 } 767 }
@@ -999,7 +999,7 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
999 /* load microcode */ 999 /* load microcode */
1000 err = ipw2100_ucode_download(priv, &ipw2100_firmware); 1000 err = ipw2100_ucode_download(priv, &ipw2100_firmware);
1001 if (err) { 1001 if (err) {
1002 IPW_DEBUG_ERROR("%s: Error loading microcode: %d\n", 1002 printk(KERN_ERR DRV_NAME ": %s: Error loading microcode: %d\n",
1003 priv->net_dev->name, err); 1003 priv->net_dev->name, err);
1004 goto fail; 1004 goto fail;
1005 } 1005 }
@@ -1012,7 +1012,7 @@ static int ipw2100_download_firmware(struct ipw2100_priv *priv)
1012 /* s/w reset and clock stabilization (again!!!) */ 1012 /* s/w reset and clock stabilization (again!!!) */
1013 err = sw_reset_and_clock(priv); 1013 err = sw_reset_and_clock(priv);
1014 if (err) { 1014 if (err) {
1015 IPW_DEBUG_ERROR("%s: sw_reset_and_clock failed: %d\n", 1015 printk(KERN_ERR DRV_NAME ": %s: sw_reset_and_clock failed: %d\n",
1016 priv->net_dev->name, err); 1016 priv->net_dev->name, err);
1017 goto fail; 1017 goto fail;
1018 } 1018 }
@@ -1206,7 +1206,7 @@ static int ipw2100_start_adapter(struct ipw2100_priv *priv)
1206 * fw & dino ucode 1206 * fw & dino ucode
1207 */ 1207 */
1208 if (ipw2100_download_firmware(priv)) { 1208 if (ipw2100_download_firmware(priv)) {
1209 IPW_DEBUG_ERROR("%s: Failed to power on the adapter.\n", 1209 printk(KERN_ERR DRV_NAME ": %s: Failed to power on the adapter.\n",
1210 priv->net_dev->name); 1210 priv->net_dev->name);
1211 return -EIO; 1211 return -EIO;
1212 } 1212 }
@@ -1266,7 +1266,7 @@ static int ipw2100_start_adapter(struct ipw2100_priv *priv)
1266 i ? "SUCCESS" : "FAILED"); 1266 i ? "SUCCESS" : "FAILED");
1267 1267
1268 if (!i) { 1268 if (!i) {
1269 IPW_DEBUG_WARNING("%s: Firmware did not initialize.\n", 1269 printk(KERN_WARNING DRV_NAME ": %s: Firmware did not initialize.\n",
1270 priv->net_dev->name); 1270 priv->net_dev->name);
1271 return -EIO; 1271 return -EIO;
1272 } 1272 }
@@ -1462,7 +1462,7 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
1462 1462
1463 err = ipw2100_hw_phy_off(priv); 1463 err = ipw2100_hw_phy_off(priv);
1464 if (err) 1464 if (err)
1465 IPW_DEBUG_WARNING("Error disabling radio %d\n", err); 1465 printk(KERN_WARNING DRV_NAME ": Error disabling radio %d\n", err);
1466 1466
1467 /* 1467 /*
1468 * If in D0-standby mode going directly to D3 may cause a 1468 * If in D0-standby mode going directly to D3 may cause a
@@ -1488,7 +1488,7 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
1488 1488
1489 err = ipw2100_hw_send_command(priv, &cmd); 1489 err = ipw2100_hw_send_command(priv, &cmd);
1490 if (err) 1490 if (err)
1491 IPW_DEBUG_WARNING( 1491 printk(KERN_WARNING DRV_NAME ": "
1492 "%s: Power down command failed: Error %d\n", 1492 "%s: Power down command failed: Error %d\n",
1493 priv->net_dev->name, err); 1493 priv->net_dev->name, err);
1494 else { 1494 else {
@@ -1529,7 +1529,7 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
1529 } 1529 }
1530 1530
1531 if (i == 0) 1531 if (i == 0)
1532 IPW_DEBUG_WARNING(DRV_NAME 1532 printk(KERN_WARNING DRV_NAME
1533 ": %s: Could now power down adapter.\n", 1533 ": %s: Could now power down adapter.\n",
1534 priv->net_dev->name); 1534 priv->net_dev->name);
1535 1535
@@ -1569,13 +1569,13 @@ static int ipw2100_disable_adapter(struct ipw2100_priv *priv)
1569 1569
1570 err = ipw2100_hw_send_command(priv, &cmd); 1570 err = ipw2100_hw_send_command(priv, &cmd);
1571 if (err) { 1571 if (err) {
1572 IPW_DEBUG_WARNING("exit - failed to send CARD_DISABLE command\n"); 1572 printk(KERN_WARNING DRV_NAME ": exit - failed to send CARD_DISABLE command\n");
1573 goto fail_up; 1573 goto fail_up;
1574 } 1574 }
1575 1575
1576 err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_DISABLED); 1576 err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_DISABLED);
1577 if (err) { 1577 if (err) {
1578 IPW_DEBUG_WARNING("exit - card failed to change to DISABLED\n"); 1578 printk(KERN_WARNING DRV_NAME ": exit - card failed to change to DISABLED\n");
1579 goto fail_up; 1579 goto fail_up;
1580 } 1580 }
1581 1581
@@ -1685,7 +1685,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
1685 (priv->status & STATUS_RESET_PENDING)) { 1685 (priv->status & STATUS_RESET_PENDING)) {
1686 /* Power cycle the card ... */ 1686 /* Power cycle the card ... */
1687 if (ipw2100_power_cycle_adapter(priv)) { 1687 if (ipw2100_power_cycle_adapter(priv)) {
1688 IPW_DEBUG_WARNING("%s: Could not cycle adapter.\n", 1688 printk(KERN_WARNING DRV_NAME ": %s: Could not cycle adapter.\n",
1689 priv->net_dev->name); 1689 priv->net_dev->name);
1690 rc = 1; 1690 rc = 1;
1691 goto exit; 1691 goto exit;
@@ -1695,7 +1695,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
1695 1695
1696 /* Load the firmware, start the clocks, etc. */ 1696 /* Load the firmware, start the clocks, etc. */
1697 if (ipw2100_start_adapter(priv)) { 1697 if (ipw2100_start_adapter(priv)) {
1698 IPW_DEBUG_ERROR("%s: Failed to start the firmware.\n", 1698 printk(KERN_ERR DRV_NAME ": %s: Failed to start the firmware.\n",
1699 priv->net_dev->name); 1699 priv->net_dev->name);
1700 rc = 1; 1700 rc = 1;
1701 goto exit; 1701 goto exit;
@@ -1705,7 +1705,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
1705 1705
1706 /* Determine capabilities of this particular HW configuration */ 1706 /* Determine capabilities of this particular HW configuration */
1707 if (ipw2100_get_hw_features(priv)) { 1707 if (ipw2100_get_hw_features(priv)) {
1708 IPW_DEBUG_ERROR("%s: Failed to determine HW features.\n", 1708 printk(KERN_ERR DRV_NAME ": %s: Failed to determine HW features.\n",
1709 priv->net_dev->name); 1709 priv->net_dev->name);
1710 rc = 1; 1710 rc = 1;
1711 goto exit; 1711 goto exit;
@@ -1713,7 +1713,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
1713 1713
1714 lock = LOCK_NONE; 1714 lock = LOCK_NONE;
1715 if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) { 1715 if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {
1716 IPW_DEBUG_ERROR("%s: Failed to clear ordinal lock.\n", 1716 printk(KERN_ERR DRV_NAME ": %s: Failed to clear ordinal lock.\n",
1717 priv->net_dev->name); 1717 priv->net_dev->name);
1718 rc = 1; 1718 rc = 1;
1719 goto exit; 1719 goto exit;
@@ -1739,7 +1739,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
1739 /* Send all of the commands that must be sent prior to 1739 /* Send all of the commands that must be sent prior to
1740 * HOST_COMPLETE */ 1740 * HOST_COMPLETE */
1741 if (ipw2100_adapter_setup(priv)) { 1741 if (ipw2100_adapter_setup(priv)) {
1742 IPW_DEBUG_ERROR("%s: Failed to start the card.\n", 1742 printk(KERN_ERR DRV_NAME ": %s: Failed to start the card.\n",
1743 priv->net_dev->name); 1743 priv->net_dev->name);
1744 rc = 1; 1744 rc = 1;
1745 goto exit; 1745 goto exit;
@@ -1748,7 +1748,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
1748 if (!deferred) { 1748 if (!deferred) {
1749 /* Enable the adapter - sends HOST_COMPLETE */ 1749 /* Enable the adapter - sends HOST_COMPLETE */
1750 if (ipw2100_enable_adapter(priv)) { 1750 if (ipw2100_enable_adapter(priv)) {
1751 IPW_DEBUG_ERROR( 1751 printk(KERN_ERR DRV_NAME ": "
1752 "%s: failed in call to enable adapter.\n", 1752 "%s: failed in call to enable adapter.\n",
1753 priv->net_dev->name); 1753 priv->net_dev->name);
1754 ipw2100_hw_stop_adapter(priv); 1754 ipw2100_hw_stop_adapter(priv);
@@ -1806,7 +1806,7 @@ static void ipw2100_down(struct ipw2100_priv *priv)
1806 spin_unlock_irqrestore(&priv->low_lock, flags); 1806 spin_unlock_irqrestore(&priv->low_lock, flags);
1807 1807
1808 if (ipw2100_hw_stop_adapter(priv)) 1808 if (ipw2100_hw_stop_adapter(priv))
1809 IPW_DEBUG_ERROR("%s: Error stopping adapter.\n", 1809 printk(KERN_ERR DRV_NAME ": %s: Error stopping adapter.\n",
1810 priv->net_dev->name); 1810 priv->net_dev->name);
1811 1811
1812 /* Do not disable the interrupt until _after_ we disable 1812 /* Do not disable the interrupt until _after_ we disable
@@ -2413,7 +2413,7 @@ static inline void isr_rx(struct ipw2100_priv *priv, int i,
2413 2413
2414 /* We need to allocate a new SKB and attach it to the RDB. */ 2414 /* We need to allocate a new SKB and attach it to the RDB. */
2415 if (unlikely(ipw2100_alloc_skb(priv, packet))) { 2415 if (unlikely(ipw2100_alloc_skb(priv, packet))) {
2416 IPW_DEBUG_WARNING( 2416 printk(KERN_WARNING DRV_NAME ": "
2417 "%s: Unable to allocate SKB onto RBD ring - disabling " 2417 "%s: Unable to allocate SKB onto RBD ring - disabling "
2418 "adapter.\n", priv->net_dev->name); 2418 "adapter.\n", priv->net_dev->name);
2419 /* TODO: schedule adapter shutdown */ 2419 /* TODO: schedule adapter shutdown */
@@ -2675,7 +2675,7 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
2675 break; 2675 break;
2676 2676
2677 default: 2677 default:
2678 IPW_DEBUG_WARNING("%s: Bad fw_pend_list entry!\n", 2678 printk(KERN_WARNING DRV_NAME ": %s: Bad fw_pend_list entry!\n",
2679 priv->net_dev->name); 2679 priv->net_dev->name);
2680 return 0; 2680 return 0;
2681 } 2681 }
@@ -2689,7 +2689,7 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
2689 read_register(priv->net_dev, IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX, 2689 read_register(priv->net_dev, IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
2690 &w); 2690 &w);
2691 if (w != txq->next) 2691 if (w != txq->next)
2692 IPW_DEBUG_WARNING("%s: write index mismatch\n", 2692 printk(KERN_WARNING DRV_NAME ": %s: write index mismatch\n",
2693 priv->net_dev->name); 2693 priv->net_dev->name);
2694 2694
2695 /* 2695 /*
@@ -2750,7 +2750,7 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
2750 switch (packet->type) { 2750 switch (packet->type) {
2751 case DATA: 2751 case DATA:
2752 if (txq->drv[txq->oldest].status.info.fields.txType != 0) 2752 if (txq->drv[txq->oldest].status.info.fields.txType != 0)
2753 IPW_DEBUG_WARNING("%s: Queue mismatch. " 2753 printk(KERN_WARNING DRV_NAME ": %s: Queue mismatch. "
2754 "Expecting DATA TBD but pulled " 2754 "Expecting DATA TBD but pulled "
2755 "something else: ids %d=%d.\n", 2755 "something else: ids %d=%d.\n",
2756 priv->net_dev->name, txq->oldest, packet->index); 2756 priv->net_dev->name, txq->oldest, packet->index);
@@ -2797,7 +2797,7 @@ static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
2797 2797
2798 case COMMAND: 2798 case COMMAND:
2799 if (txq->drv[txq->oldest].status.info.fields.txType != 1) 2799 if (txq->drv[txq->oldest].status.info.fields.txType != 1)
2800 IPW_DEBUG_WARNING("%s: Queue mismatch. " 2800 printk(KERN_WARNING DRV_NAME ": %s: Queue mismatch. "
2801 "Expecting COMMAND TBD but pulled " 2801 "Expecting COMMAND TBD but pulled "
2802 "something else: ids %d=%d.\n", 2802 "something else: ids %d=%d.\n",
2803 priv->net_dev->name, txq->oldest, packet->index); 2803 priv->net_dev->name, txq->oldest, packet->index);
@@ -3081,7 +3081,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
3081 (unsigned long)inta & IPW_INTERRUPT_MASK); 3081 (unsigned long)inta & IPW_INTERRUPT_MASK);
3082 3082
3083 if (inta & IPW2100_INTA_FATAL_ERROR) { 3083 if (inta & IPW2100_INTA_FATAL_ERROR) {
3084 IPW_DEBUG_WARNING(DRV_NAME 3084 printk(KERN_WARNING DRV_NAME
3085 ": Fatal interrupt. Scheduling firmware restart.\n"); 3085 ": Fatal interrupt. Scheduling firmware restart.\n");
3086 priv->inta_other++; 3086 priv->inta_other++;
3087 write_register( 3087 write_register(
@@ -3101,7 +3101,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
3101 } 3101 }
3102 3102
3103 if (inta & IPW2100_INTA_PARITY_ERROR) { 3103 if (inta & IPW2100_INTA_PARITY_ERROR) {
3104 IPW_DEBUG_ERROR("***** PARITY ERROR INTERRUPT !!!! \n"); 3104 printk(KERN_ERR DRV_NAME ": ***** PARITY ERROR INTERRUPT !!!! \n");
3105 priv->inta_other++; 3105 priv->inta_other++;
3106 write_register( 3106 write_register(
3107 dev, IPW_REG_INTA, 3107 dev, IPW_REG_INTA,
@@ -3219,7 +3219,7 @@ static irqreturn_t ipw2100_interrupt(int irq, void *data,
3219 3219
3220 if (inta == 0xFFFFFFFF) { 3220 if (inta == 0xFFFFFFFF) {
3221 /* Hardware disappeared */ 3221 /* Hardware disappeared */
3222 IPW_DEBUG_WARNING("IRQ INTA == 0xFFFFFFFF\n"); 3222 printk(KERN_WARNING DRV_NAME ": IRQ INTA == 0xFFFFFFFF\n");
3223 goto none; 3223 goto none;
3224 } 3224 }
3225 3225
@@ -3304,7 +3304,7 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
3304 IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet), 3304 IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
3305 GFP_KERNEL); 3305 GFP_KERNEL);
3306 if (!priv->msg_buffers) { 3306 if (!priv->msg_buffers) {
3307 IPW_DEBUG_ERROR("%s: PCI alloc failed for msg " 3307 printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg "
3308 "buffers.\n", priv->net_dev->name); 3308 "buffers.\n", priv->net_dev->name);
3309 return -ENOMEM; 3309 return -ENOMEM;
3310 } 3310 }
@@ -3315,7 +3315,7 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
3315 sizeof(struct ipw2100_cmd_header), 3315 sizeof(struct ipw2100_cmd_header),
3316 &p); 3316 &p);
3317 if (!v) { 3317 if (!v) {
3318 IPW_DEBUG_ERROR( 3318 printk(KERN_ERR DRV_NAME ": "
3319 "%s: PCI alloc failed for msg " 3319 "%s: PCI alloc failed for msg "
3320 "buffers.\n", 3320 "buffers.\n",
3321 priv->net_dev->name); 3321 priv->net_dev->name);
@@ -3822,7 +3822,7 @@ int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)
3822 3822
3823 err = ipw2100_disable_adapter(priv); 3823 err = ipw2100_disable_adapter(priv);
3824 if (err) { 3824 if (err) {
3825 IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n", 3825 printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
3826 priv->net_dev->name, err); 3826 priv->net_dev->name, err);
3827 return err; 3827 return err;
3828 } 3828 }
@@ -4268,7 +4268,7 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
4268 TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet), 4268 TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet),
4269 GFP_ATOMIC); 4269 GFP_ATOMIC);
4270 if (!priv->tx_buffers) { 4270 if (!priv->tx_buffers) {
4271 IPW_DEBUG_ERROR("%s: alloc failed form tx buffers.\n", 4271 printk(KERN_ERR DRV_NAME ": %s: alloc failed form tx buffers.\n",
4272 priv->net_dev->name); 4272 priv->net_dev->name);
4273 bd_queue_free(priv, &priv->tx_queue); 4273 bd_queue_free(priv, &priv->tx_queue);
4274 return -ENOMEM; 4274 return -ENOMEM;
@@ -4278,7 +4278,7 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
4278 v = pci_alloc_consistent( 4278 v = pci_alloc_consistent(
4279 priv->pci_dev, sizeof(struct ipw2100_data_header), &p); 4279 priv->pci_dev, sizeof(struct ipw2100_data_header), &p);
4280 if (!v) { 4280 if (!v) {
4281 IPW_DEBUG_ERROR("%s: PCI alloc failed for tx " 4281 printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for tx "
4282 "buffers.\n", priv->net_dev->name); 4282 "buffers.\n", priv->net_dev->name);
4283 err = -ENOMEM; 4283 err = -ENOMEM;
4284 break; 4284 break;
@@ -4589,7 +4589,7 @@ int ipw2100_set_port_type(struct ipw2100_priv *priv, u32 port_type,
4589 if (!batch_mode) { 4589 if (!batch_mode) {
4590 err = ipw2100_disable_adapter(priv); 4590 err = ipw2100_disable_adapter(priv);
4591 if (err) { 4591 if (err) {
4592 IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n", 4592 printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
4593 priv->net_dev->name, err); 4593 priv->net_dev->name, err);
4594 return err; 4594 return err;
4595 } 4595 }
@@ -5208,7 +5208,7 @@ static int ipw2100_set_wep_flags(struct ipw2100_priv *priv, u32 flags,
5208 if (!batch_mode) { 5208 if (!batch_mode) {
5209 err = ipw2100_disable_adapter(priv); 5209 err = ipw2100_disable_adapter(priv);
5210 if (err) { 5210 if (err) {
5211 IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n", 5211 printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
5212 priv->net_dev->name, err); 5212 priv->net_dev->name, err);
5213 return err; 5213 return err;
5214 } 5214 }
@@ -5296,7 +5296,7 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,
5296 err = ipw2100_disable_adapter(priv); 5296 err = ipw2100_disable_adapter(priv);
5297 /* FIXME: IPG: shouldn't this prink be in _disable_adapter()? */ 5297 /* FIXME: IPG: shouldn't this prink be in _disable_adapter()? */
5298 if (err) { 5298 if (err) {
5299 IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n", 5299 printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
5300 priv->net_dev->name, err); 5300 priv->net_dev->name, err);
5301 return err; 5301 return err;
5302 } 5302 }
@@ -5332,7 +5332,7 @@ static int ipw2100_set_key_index(struct ipw2100_priv *priv,
5332 if (!batch_mode) { 5332 if (!batch_mode) {
5333 err = ipw2100_disable_adapter(priv); 5333 err = ipw2100_disable_adapter(priv);
5334 if (err) { 5334 if (err) {
5335 IPW_DEBUG_ERROR("%s: Could not disable adapter %d\n", 5335 printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
5336 priv->net_dev->name, err); 5336 priv->net_dev->name, err);
5337 return err; 5337 return err;
5338 } 5338 }
@@ -5880,7 +5880,7 @@ static int ipw2100_wpa_set_param(struct net_device *dev, u8 name, u32 value){
5880 break; 5880 break;
5881 5881
5882 default: 5882 default:
5883 IPW_DEBUG_ERROR("%s: Unknown WPA param: %d\n", 5883 printk(KERN_ERR DRV_NAME ": %s: Unknown WPA param: %d\n",
5884 dev->name, name); 5884 dev->name, name);
5885 ret = -EOPNOTSUPP; 5885 ret = -EOPNOTSUPP;
5886 } 5886 }
@@ -5903,7 +5903,7 @@ static int ipw2100_wpa_mlme(struct net_device *dev, int command, int reason){
5903 break; 5903 break;
5904 5904
5905 default: 5905 default:
5906 IPW_DEBUG_ERROR("%s: Unknown MLME request: %d\n", 5906 printk(KERN_ERR DRV_NAME ": %s: Unknown MLME request: %d\n",
5907 dev->name, command); 5907 dev->name, command);
5908 ret = -EOPNOTSUPP; 5908 ret = -EOPNOTSUPP;
5909 } 5909 }
@@ -6153,7 +6153,7 @@ static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p){
6153 break; 6153 break;
6154 6154
6155 default: 6155 default:
6156 IPW_DEBUG_ERROR("%s: Unknown WPA supplicant request: %d\n", 6156 printk(KERN_ERR DRV_NAME ": %s: Unknown WPA supplicant request: %d\n",
6157 dev->name, param->cmd); 6157 dev->name, param->cmd);
6158 ret = -EOPNOTSUPP; 6158 ret = -EOPNOTSUPP;
6159 6159
@@ -8375,7 +8375,7 @@ static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
8375 (struct ipw2100_fw_header *)fw->fw_entry->data; 8375 (struct ipw2100_fw_header *)fw->fw_entry->data;
8376 8376
8377 if (IPW2100_FW_MAJOR(h->version) != IPW2100_FW_MAJOR_VERSION) { 8377 if (IPW2100_FW_MAJOR(h->version) != IPW2100_FW_MAJOR_VERSION) {
8378 IPW_DEBUG_WARNING("Firmware image not compatible " 8378 printk(KERN_WARNING DRV_NAME ": Firmware image not compatible "
8379 "(detected version id of %u). " 8379 "(detected version id of %u). "
8380 "See Documentation/networking/README.ipw2100\n", 8380 "See Documentation/networking/README.ipw2100\n",
8381 h->version); 8381 h->version);
@@ -8418,7 +8418,7 @@ int ipw2100_get_firmware(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
8418 rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev); 8418 rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev);
8419 8419
8420 if (rc < 0) { 8420 if (rc < 0) {
8421 IPW_DEBUG_ERROR( 8421 printk(KERN_ERR DRV_NAME ": "
8422 "%s: Firmware '%s' not available or load failed.\n", 8422 "%s: Firmware '%s' not available or load failed.\n",
8423 priv->net_dev->name, fw_name); 8423 priv->net_dev->name, fw_name);
8424 return rc; 8424 return rc;
@@ -8500,7 +8500,7 @@ int ipw2100_fw_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
8500 firmware_data_left -= 2; 8500 firmware_data_left -= 2;
8501 8501
8502 if (len > 32) { 8502 if (len > 32) {
8503 IPW_DEBUG_ERROR( 8503 printk(KERN_ERR DRV_NAME ": "
8504 "Invalid firmware run-length of %d bytes\n", 8504 "Invalid firmware run-length of %d bytes\n",
8505 len); 8505 len);
8506 return -EINVAL; 8506 return -EINVAL;
@@ -8610,7 +8610,7 @@ int ipw2100_ucode_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
8610 } 8610 }
8611 8611
8612 if (i == 10) { 8612 if (i == 10) {
8613 IPW_DEBUG_ERROR("%s: Error initializing Symbol\n", 8613 printk(KERN_ERR DRV_NAME ": %s: Error initializing Symbol\n",
8614 dev->name); 8614 dev->name);
8615 return -EIO; 8615 return -EIO;
8616 } 8616 }
@@ -8631,7 +8631,7 @@ int ipw2100_ucode_download(struct ipw2100_priv *priv, struct ipw2100_fw *fw)
8631 } 8631 }
8632 8632
8633 if (i == 30) { 8633 if (i == 30) {
8634 IPW_DEBUG_ERROR("%s: No response from Symbol - hw not alive\n", 8634 printk(KERN_ERR DRV_NAME ": %s: No response from Symbol - hw not alive\n",
8635 dev->name); 8635 dev->name);
8636 printk_buf(IPW_DL_ERROR, (u8*)&response, sizeof(response)); 8636 printk_buf(IPW_DL_ERROR, (u8*)&response, sizeof(response));
8637 return -EIO; 8637 return -EIO;