Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5db55844 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

drivers/net/wireless: Restore upper case words in wiphy_<level> messages 



Commit c96c31e4
"(drivers/net/wireless: Use wiphy_<level>)"
inadvertently changed some upper case words to
lower case.  Restore the original case.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8b8ab9d5

drivers/net/wireless/adm8211.c

+4 −4
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int adm8211_rf_set_channel(struct ieee80211_hw *dev, unsigned int chan) 


	/* Nothing to do for ADMtek BBP */

	} else if (priv->bbp_type != ADM8211_TYPE_ADMTEK)

		wiphy_debug(dev->wiphy, "unsupported bbp type %d\n",

		wiphy_debug(dev->wiphy, "unsupported BBP type %d\n",

			    priv->bbp_type);



	ADM8211_RESTORE();
@@ -1032,7 +1032,7 @@ static int adm8211_hw_init_bbp(struct ieee80211_hw *dev) 
			break;

		}

	} else

		wiphy_debug(dev->wiphy, "unsupported bbp %d\n", priv->bbp_type);

		wiphy_debug(dev->wiphy, "unsupported BBP %d\n", priv->bbp_type);



	ADM8211_CSR_WRITE(SYNRF, 0);
@@ -1525,7 +1525,7 @@ static int adm8211_start(struct ieee80211_hw *dev) 
	retval = request_irq(priv->pdev->irq, adm8211_interrupt,

			     IRQF_SHARED, "adm8211", dev);

	if (retval) {

		wiphy_err(dev->wiphy, "failed to register irq handler\n");

		wiphy_err(dev->wiphy, "failed to register IRQ handler\n");

		goto fail;

	}
@@ -1902,7 +1902,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, 
		goto err_free_eeprom;

	}



	wiphy_info(dev->wiphy, "hwaddr %pm, rev 0x%02x\n",

	wiphy_info(dev->wiphy, "hwaddr %pM, Rev 0x%02x\n",

		   dev->wiphy->perm_addr, pdev->revision);



	return 0;

drivers/net/wireless/at76c50x-usb.c

+11 −11
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static int at76_get_hw_config(struct at76_priv *priv) 
exit:

	kfree(hwcfg);

	if (ret < 0)

		wiphy_err(priv->hw->wiphy, "cannot get hw config (error %d)\n",

		wiphy_err(priv->hw->wiphy, "cannot get HW Config (error %d)\n",

			  ret);



	return ret;
@@ -960,7 +960,7 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv) 
			   sizeof(struct mib_mac_addr));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac_addr) failed: %d\n", ret);

			  "at76_get_mib (MAC_ADDR) failed: %d\n", ret);

		goto exit;

	}
@@ -989,7 +989,7 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv) 
			   sizeof(struct mib_mac_wep));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac_wep) failed: %d\n", ret);

			  "at76_get_mib (MAC_WEP) failed: %d\n", ret);

		goto exit;

	}
@@ -1026,7 +1026,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) 
			   sizeof(struct mib_mac_mgmt));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac_mgmt) failed: %d\n", ret);

			  "at76_get_mib (MAC_MGMT) failed: %d\n", ret);

		goto exit;

	}
@@ -1062,7 +1062,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv) 
	ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac) failed: %d\n", ret);

			  "at76_get_mib (MAC) failed: %d\n", ret);

		goto exit;

	}
@@ -1099,7 +1099,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv) 
	ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (phy) failed: %d\n", ret);

			  "at76_get_mib (PHY) failed: %d\n", ret);

		goto exit;

	}
@@ -1132,7 +1132,7 @@ static void at76_dump_mib_local(struct at76_priv *priv) 
	ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (local) failed: %d\n", ret);

			  "at76_get_mib (LOCAL) failed: %d\n", ret);

		goto exit;

	}
@@ -1158,7 +1158,7 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv) 
			   sizeof(struct mib_mdomain));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mdomain) failed: %d\n", ret);

			  "at76_get_mib (MDOMAIN) failed: %d\n", ret);

		goto exit;

	}
@@ -1229,7 +1229,7 @@ static int at76_submit_rx_urb(struct at76_priv *priv) 
	struct sk_buff *skb = priv->rx_skb;



	if (!priv->rx_urb) {

		wiphy_err(priv->hw->wiphy, "%s: priv->rx_urb is null\n",

		wiphy_err(priv->hw->wiphy, "%s: priv->rx_urb is NULL\n",

			  __func__);

		return -EFAULT;

	}
@@ -1792,7 +1792,7 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		wiphy_err(priv->hw->wiphy, "error in tx submit urb: %d\n", ret);

		if (ret == -EINVAL)

			wiphy_err(priv->hw->wiphy,

				  "-einval: tx urb %p hcpriv %p complete %p\n",

				  "-EINVAL: tx urb %p hcpriv %p complete %p\n",

				  priv->tx_urb,

				  priv->tx_urb->hcpriv, priv->tx_urb->complete);

	}
@@ -2310,7 +2310,7 @@ static int at76_init_new_device(struct at76_priv *priv, 


	priv->mac80211_registered = 1;



	wiphy_info(priv->hw->wiphy, "usb %s, mac %pm, firmware %d.%d.%d-%d\n",

	wiphy_info(priv->hw->wiphy, "USB %s, MAC %pM, firmware %d.%d.%d-%d\n",

		   dev_name(&interface->dev), priv->mac_addr,

		   priv->fw_version.major, priv->fw_version.minor,

		   priv->fw_version.patch, priv->fw_version.build);

drivers/net/wireless/ath/ar9170/main.c

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void __ar9170_dump_txstats(struct ar9170 *ar) 
{

	int i;



	wiphy_debug(ar->hw->wiphy, "qos queue stats\n");

	wiphy_debug(ar->hw->wiphy, "QoS queue stats\n");



	for (i = 0; i < __AR9170_NUM_TXQ; i++)

		wiphy_debug(ar->hw->wiphy,
@@ -387,7 +387,7 @@ static struct sk_buff *ar9170_get_queued_skb(struct ar9170 *ar, 
		if (mac && compare_ether_addr(ieee80211_get_DA(hdr), mac)) {

#ifdef AR9170_QUEUE_DEBUG

			wiphy_debug(ar->hw->wiphy,

				    "skip frame => da %pm != %pm\n",

				    "skip frame => DA %pM != %pM\n",

				    mac, ieee80211_get_DA(hdr));

			ar9170_print_txheader(ar, skb);

#endif /* AR9170_QUEUE_DEBUG */

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, 
	struct ieee80211_rx_status rx_status;



	if (data->idle) {

		wiphy_debug(hw->wiphy, "trying to tx when idle - reject\n");

		wiphy_debug(hw->wiphy, "Trying to TX when idle - reject\n");

		return false;

	}

drivers/net/wireless/mwl8k.c

+17 −17
Original line number Diff line number Diff line
@@ -910,14 +910,14 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index) 


	rxq->rxd = pci_alloc_consistent(priv->pdev, size, &rxq->rxd_dma);

	if (rxq->rxd == NULL) {

		wiphy_err(hw->wiphy, "failed to alloc rx descriptors\n");

		wiphy_err(hw->wiphy, "failed to alloc RX descriptors\n");

		return -ENOMEM;

	}

	memset(rxq->rxd, 0, size);



	rxq->buf = kmalloc(MWL8K_RX_DESCS * sizeof(*rxq->buf), GFP_KERNEL);

	if (rxq->buf == NULL) {

		wiphy_err(hw->wiphy, "failed to alloc rx skbuff list\n");

		wiphy_err(hw->wiphy, "failed to alloc RX skbuff list\n");

		pci_free_consistent(priv->pdev, size, rxq->rxd, rxq->rxd_dma);

		return -ENOMEM;

	}
@@ -1145,14 +1145,14 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index) 


	txq->txd = pci_alloc_consistent(priv->pdev, size, &txq->txd_dma);

	if (txq->txd == NULL) {

		wiphy_err(hw->wiphy, "failed to alloc tx descriptors\n");

		wiphy_err(hw->wiphy, "failed to alloc TX descriptors\n");

		return -ENOMEM;

	}

	memset(txq->txd, 0, size);



	txq->skb = kmalloc(MWL8K_TX_DESCS * sizeof(*txq->skb), GFP_KERNEL);

	if (txq->skb == NULL) {

		wiphy_err(hw->wiphy, "failed to alloc tx skbuff list\n");

		wiphy_err(hw->wiphy, "failed to alloc TX skbuff list\n");

		pci_free_consistent(priv->pdev, size, txq->txd, txq->txd_dma);

		return -ENOMEM;

	}
@@ -1573,7 +1573,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd) 
					PCI_DMA_BIDIRECTIONAL);



	if (!timeout) {

		wiphy_err(hw->wiphy, "command %s timeout after %u ms\n",

		wiphy_err(hw->wiphy, "Command %s timeout after %u ms\n",

			  mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),

			  MWL8K_CMD_TIMEOUT_MS);

		rc = -ETIMEDOUT;
@@ -1584,11 +1584,11 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd) 


		rc = cmd->result ? -EINVAL : 0;

		if (rc)

			wiphy_err(hw->wiphy, "command %s error 0x%x\n",

			wiphy_err(hw->wiphy, "Command %s error 0x%x\n",

				  mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),

				  le16_to_cpu(cmd->result));

		else if (ms > 2000)

			wiphy_notice(hw->wiphy, "command %s took %d ms\n",

			wiphy_notice(hw->wiphy, "Command %s took %d ms\n",

				     mwl8k_cmd_name(cmd->code,

						    buf, sizeof(buf)),

				     ms);
@@ -3210,7 +3210,7 @@ static int mwl8k_start(struct ieee80211_hw *hw) 
	rc = request_irq(priv->pdev->irq, mwl8k_interrupt,

			 IRQF_SHARED, MWL8K_NAME, hw);

	if (rc) {

		wiphy_err(hw->wiphy, "failed to register irq handler\n");

		wiphy_err(hw->wiphy, "failed to register IRQ handler\n");

		return -EIO;

	}
@@ -3926,7 +3926,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 


	priv->sram = pci_iomap(pdev, 0, 0x10000);

	if (priv->sram == NULL) {

		wiphy_err(hw->wiphy, "cannot map device sram\n");

		wiphy_err(hw->wiphy, "Cannot map device SRAM\n");

		goto err_iounmap;

	}
@@ -3938,7 +3938,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 
	if (priv->regs == NULL) {

		priv->regs = pci_iomap(pdev, 2, 0x10000);

		if (priv->regs == NULL) {

			wiphy_err(hw->wiphy, "cannot map device registers\n");

			wiphy_err(hw->wiphy, "Cannot map device registers\n");

			goto err_iounmap;

		}

	}
@@ -3950,14 +3950,14 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 
	/* Ask userland hotplug daemon for the device firmware */

	rc = mwl8k_request_firmware(priv);

	if (rc) {

		wiphy_err(hw->wiphy, "firmware files not found\n");

		wiphy_err(hw->wiphy, "Firmware files not found\n");

		goto err_stop_firmware;

	}



	/* Load firmware into hardware */

	rc = mwl8k_load_firmware(hw);

	if (rc) {

		wiphy_err(hw->wiphy, "cannot start firmware\n");

		wiphy_err(hw->wiphy, "Cannot start firmware\n");

		goto err_stop_firmware;

	}
@@ -4047,7 +4047,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 
	rc = request_irq(priv->pdev->irq, mwl8k_interrupt,

			 IRQF_SHARED, MWL8K_NAME, hw);

	if (rc) {

		wiphy_err(hw->wiphy, "failed to register irq handler\n");

		wiphy_err(hw->wiphy, "failed to register IRQ handler\n");

		goto err_free_queues;

	}
@@ -4067,7 +4067,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 
		rc = mwl8k_cmd_get_hw_spec_sta(hw);

	}

	if (rc) {

		wiphy_err(hw->wiphy, "cannot initialise firmware\n");

		wiphy_err(hw->wiphy, "Cannot initialise firmware\n");

		goto err_free_irq;

	}
@@ -4081,14 +4081,14 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 
	/* Turn radio off */

	rc = mwl8k_cmd_radio_disable(hw);

	if (rc) {

		wiphy_err(hw->wiphy, "cannot disable\n");

		wiphy_err(hw->wiphy, "Cannot disable\n");

		goto err_free_irq;

	}



	/* Clear MAC address */

	rc = mwl8k_cmd_set_mac_addr(hw, NULL, "\x00\x00\x00\x00\x00\x00");

	if (rc) {

		wiphy_err(hw->wiphy, "cannot clear mac address\n");

		wiphy_err(hw->wiphy, "Cannot clear MAC address\n");

		goto err_free_irq;

	}
@@ -4098,7 +4098,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, 


	rc = ieee80211_register_hw(hw);

	if (rc) {

		wiphy_err(hw->wiphy, "cannot register device\n");

		wiphy_err(hw->wiphy, "Cannot register device\n");

		goto err_free_queues;

	}