aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
commit268bae0b6879f238ba57f5f801958d1254e136f7 (patch)
tree132d1039370644b2c6a2d2f8903024de3e47b020 /drivers/net/wireless/rtl818x
parentd70e96932de55fb2c05b1c0af1dff178651a9b77 (diff)
parent6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/rtl818x')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180_dev.c6
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187_dev.c4
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187_rtl8225.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 9544eb1a23dc..05c6badbe201 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -452,7 +452,7 @@ static int rtl8180_init_rx_ring(struct ieee80211_hw *dev)
452 &priv->rx_ring_dma); 452 &priv->rx_ring_dma);
453 453
454 if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) { 454 if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) {
455 wiphy_err(dev->wiphy, "cannot allocate rx ring\n"); 455 wiphy_err(dev->wiphy, "Cannot allocate RX ring\n");
456 return -ENOMEM; 456 return -ENOMEM;
457 } 457 }
458 458
@@ -509,7 +509,7 @@ static int rtl8180_init_tx_ring(struct ieee80211_hw *dev,
509 509
510 ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma); 510 ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma);
511 if (!ring || (unsigned long)ring & 0xFF) { 511 if (!ring || (unsigned long)ring & 0xFF) {
512 wiphy_err(dev->wiphy, "cannot allocate tx ring (prio = %d)\n", 512 wiphy_err(dev->wiphy, "Cannot allocate TX ring (prio = %d)\n",
513 prio); 513 prio);
514 return -ENOMEM; 514 return -ENOMEM;
515 } 515 }
@@ -575,7 +575,7 @@ static int rtl8180_start(struct ieee80211_hw *dev)
575 ret = request_irq(priv->pdev->irq, rtl8180_interrupt, 575 ret = request_irq(priv->pdev->irq, rtl8180_interrupt,
576 IRQF_SHARED, KBUILD_MODNAME, dev); 576 IRQF_SHARED, KBUILD_MODNAME, dev);
577 if (ret) { 577 if (ret) {
578 wiphy_err(dev->wiphy, "failed to register irq handler\n"); 578 wiphy_err(dev->wiphy, "failed to register IRQ handler\n");
579 goto err_free_rings; 579 goto err_free_rings;
580 } 580 }
581 581
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 0801c1d7c8d4..38fa8244cc96 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -573,7 +573,7 @@ static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
573 } while (--i); 573 } while (--i);
574 574
575 if (!i) { 575 if (!i) {
576 wiphy_err(dev->wiphy, "reset timeout!\n"); 576 wiphy_err(dev->wiphy, "Reset timeout!\n");
577 return -ETIMEDOUT; 577 return -ETIMEDOUT;
578 } 578 }
579 579
@@ -1525,7 +1525,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
1525 mutex_init(&priv->conf_mutex); 1525 mutex_init(&priv->conf_mutex);
1526 skb_queue_head_init(&priv->b_tx_status.queue); 1526 skb_queue_head_init(&priv->b_tx_status.queue);
1527 1527
1528 wiphy_info(dev->wiphy, "hwaddr %pm, %s v%d + %s, rfkill mask %d\n", 1528 wiphy_info(dev->wiphy, "hwaddr %pM, %s V%d + %s, rfkill mask %d\n",
1529 mac_addr, chip_name, priv->asic_rev, priv->rf->name, 1529 mac_addr, chip_name, priv->asic_rev, priv->rf->name,
1530 priv->rfkill_mask); 1530 priv->rfkill_mask);
1531 1531
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
index fd96f9112322..97eebdcf7eb9 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
@@ -366,7 +366,7 @@ static void rtl8225_rf_init(struct ieee80211_hw *dev)
366 rtl8225_write(dev, 0x02, 0x044d); 366 rtl8225_write(dev, 0x02, 0x044d);
367 msleep(100); 367 msleep(100);
368 if (!(rtl8225_read(dev, 6) & (1 << 7))) 368 if (!(rtl8225_read(dev, 6) & (1 << 7)))
369 wiphy_warn(dev->wiphy, "rf calibration failed! %x\n", 369 wiphy_warn(dev->wiphy, "RF Calibration Failed! %x\n",
370 rtl8225_read(dev, 6)); 370 rtl8225_read(dev, 6));
371 } 371 }
372 372
@@ -735,7 +735,7 @@ static void rtl8225z2_rf_init(struct ieee80211_hw *dev)
735 rtl8225_write(dev, 0x02, 0x044D); 735 rtl8225_write(dev, 0x02, 0x044D);
736 msleep(100); 736 msleep(100);
737 if (!(rtl8225_read(dev, 6) & (1 << 7))) 737 if (!(rtl8225_read(dev, 6) & (1 << 7)))
738 wiphy_warn(dev->wiphy, "rf calibration failed! %x\n", 738 wiphy_warn(dev->wiphy, "RF Calibration Failed! %x\n",
739 rtl8225_read(dev, 6)); 739 rtl8225_read(dev, 6));
740 } 740 }
741 741