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

Commit 7743882d authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files

wil6210: fix checkpatch CamelCase warnings 



Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e08b5906

drivers/net/wireless/ath/wil6210/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int wil_cfg80211_scan(struct wiphy *wiphy, 
		}

		/* 0-based channel indexes */

		cmd.cmd.channel_list[cmd.cmd.num_channels++].channel = ch - 1;

		wil_dbg_MISC(wil, "Scan for ch %d  : %d MHz\n", ch,

		wil_dbg_misc(wil, "Scan for ch %d  : %d MHz\n", ch,

			     request->channels[i]->center_freq);

	}
@@ -425,7 +425,7 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy, 
		return -EINVAL;

	}



	wil_dbg_MISC(wil, "AP on Channel %d %d MHz, %s\n", channel->hw_value,

	wil_dbg_misc(wil, "AP on Channel %d %d MHz, %s\n", channel->hw_value,

		     channel->center_freq, info->privacy ? "secure" : "open");

	print_hex_dump_bytes("SSID ", DUMP_PREFIX_OFFSET,

			     info->ssid, info->ssid_len);

drivers/net/wireless/ath/wil6210/interrupt.c

+16 −16
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void wil6210_mask_irq_misc(struct wil6210_priv *wil) 


static void wil6210_mask_irq_pseudo(struct wil6210_priv *wil)

{

	wil_dbg_IRQ(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "%s()\n", __func__);



	iowrite32(WIL6210_IRQ_DISABLE, wil->csr +

		  HOSTADDR(RGF_DMA_PSEUDO_CAUSE_MASK_SW));
@@ -127,7 +127,7 @@ static void wil6210_unmask_irq_misc(struct wil6210_priv *wil) 


static void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil)

{

	wil_dbg_IRQ(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "%s()\n", __func__);



	set_bit(wil_status_irqen, &wil->status);
@@ -137,7 +137,7 @@ static void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil) 


void wil6210_disable_irq(struct wil6210_priv *wil)

{

	wil_dbg_IRQ(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "%s()\n", __func__);



	wil6210_mask_irq_tx(wil);

	wil6210_mask_irq_rx(wil);
@@ -147,7 +147,7 @@ void wil6210_disable_irq(struct wil6210_priv *wil) 


void wil6210_enable_irq(struct wil6210_priv *wil)

{

	wil_dbg_IRQ(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "%s()\n", __func__);



	iowrite32(WIL_ICR_ICC_VALUE, wil->csr + HOSTADDR(RGF_DMA_EP_RX_ICR) +

		  offsetof(struct RGF_ICR, ICC));
@@ -169,7 +169,7 @@ static irqreturn_t wil6210_irq_rx(int irq, void *cookie) 
					 HOSTADDR(RGF_DMA_EP_RX_ICR) +

					 offsetof(struct RGF_ICR, ICR));



	wil_dbg_IRQ(wil, "ISR RX 0x%08x\n", isr);

	wil_dbg_irq(wil, "ISR RX 0x%08x\n", isr);



	if (!isr) {

		wil_err(wil, "spurious IRQ: RX\n");
@@ -179,7 +179,7 @@ static irqreturn_t wil6210_irq_rx(int irq, void *cookie) 
	wil6210_mask_irq_rx(wil);



	if (isr & BIT_DMA_EP_RX_ICR_RX_DONE) {

		wil_dbg_IRQ(wil, "RX done\n");

		wil_dbg_irq(wil, "RX done\n");

		isr &= ~BIT_DMA_EP_RX_ICR_RX_DONE;

		wil_rx_handle(wil);

	}
@@ -199,7 +199,7 @@ static irqreturn_t wil6210_irq_tx(int irq, void *cookie) 
					 HOSTADDR(RGF_DMA_EP_TX_ICR) +

					 offsetof(struct RGF_ICR, ICR));



	wil_dbg_IRQ(wil, "ISR TX 0x%08x\n", isr);

	wil_dbg_irq(wil, "ISR TX 0x%08x\n", isr);



	if (!isr) {

		wil_err(wil, "spurious IRQ: TX\n");
@@ -210,13 +210,13 @@ static irqreturn_t wil6210_irq_tx(int irq, void *cookie) 


	if (isr & BIT_DMA_EP_TX_ICR_TX_DONE) {

		uint i;

		wil_dbg_IRQ(wil, "TX done\n");

		wil_dbg_irq(wil, "TX done\n");

		isr &= ~BIT_DMA_EP_TX_ICR_TX_DONE;

		for (i = 0; i < 24; i++) {

			u32 mask = BIT_DMA_EP_TX_ICR_TX_DONE_N(i);

			if (isr & mask) {

				isr &= ~mask;

				wil_dbg_IRQ(wil, "TX done(%i)\n", i);

				wil_dbg_irq(wil, "TX done(%i)\n", i);

				wil_tx_complete(wil, i);

			}

		}
@@ -248,7 +248,7 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie) 
					 HOSTADDR(RGF_DMA_EP_MISC_ICR) +

					 offsetof(struct RGF_ICR, ICR));



	wil_dbg_IRQ(wil, "ISR MISC 0x%08x\n", isr);

	wil_dbg_irq(wil, "ISR MISC 0x%08x\n", isr);



	if (!isr) {

		wil_err(wil, "spurious IRQ: MISC\n");
@@ -258,14 +258,14 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie) 
	wil6210_mask_irq_misc(wil);



	if (isr & ISR_MISC_FW_ERROR) {

		wil_dbg_IRQ(wil, "IRQ: Firmware error\n");

		wil_dbg_irq(wil, "IRQ: Firmware error\n");

		clear_bit(wil_status_fwready, &wil->status);

		wil_notify_fw_error(wil);

		isr &= ~ISR_MISC_FW_ERROR;

	}



	if (isr & ISR_MISC_FW_READY) {

		wil_dbg_IRQ(wil, "IRQ: FW ready\n");

		wil_dbg_irq(wil, "IRQ: FW ready\n");

		/**

		 * Actual FW ready indicated by the

		 * WMI_FW_READY_EVENTID
@@ -288,10 +288,10 @@ static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie) 
	struct wil6210_priv *wil = cookie;

	u32 isr = wil->isr_misc;



	wil_dbg_IRQ(wil, "Thread ISR MISC 0x%08x\n", isr);

	wil_dbg_irq(wil, "Thread ISR MISC 0x%08x\n", isr);



	if (isr & ISR_MISC_MBOX_EVT) {

		wil_dbg_IRQ(wil, "MBOX event\n");

		wil_dbg_irq(wil, "MBOX event\n");

		wmi_recv_cmd(wil);

		isr &= ~ISR_MISC_MBOX_EVT;

	}
@@ -313,7 +313,7 @@ static irqreturn_t wil6210_thread_irq(int irq, void *cookie) 
{

	struct wil6210_priv *wil = cookie;



	wil_dbg_IRQ(wil, "Thread IRQ\n");

	wil_dbg_irq(wil, "Thread IRQ\n");

	/* Discover real IRQ cause */

	if (wil->isr_misc)

		wil6210_irq_misc_thread(irq, cookie);
@@ -390,7 +390,7 @@ static irqreturn_t wil6210_hardirq(int irq, void *cookie) 
	if (wil6210_debug_irq_mask(wil, pseudo_cause))

		return IRQ_NONE;



	wil_dbg_IRQ(wil, "Pseudo IRQ 0x%08x\n", pseudo_cause);

	wil_dbg_irq(wil, "Pseudo IRQ 0x%08x\n", pseudo_cause);



	wil6210_mask_irq_pseudo(wil);

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

+13 −13
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid) 
	struct net_device *ndev = wil_to_ndev(wil);

	struct wireless_dev *wdev = wil->wdev;



	wil_dbg_MISC(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "%s()\n", __func__);



	wil_link_off(wil);

	clear_bit(wil_status_fwconnected, &wil->status);
@@ -101,7 +101,7 @@ static void wil_connect_timer_fn(ulong x) 
{

	struct wil6210_priv *wil = (void *)x;



	wil_dbg_MISC(wil, "Connect timeout\n");

	wil_dbg_misc(wil, "Connect timeout\n");



	/* reschedule to thread context - disconnect won't

	 * run from atomic context
@@ -120,7 +120,7 @@ static void wil_cache_mbox_regs(struct wil6210_priv *wil) 


int wil_priv_init(struct wil6210_priv *wil)

{

	wil_dbg_MISC(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "%s()\n", __func__);



	mutex_init(&wil->mutex);

	mutex_init(&wil->wmi_mutex);
@@ -169,7 +169,7 @@ void wil_priv_deinit(struct wil6210_priv *wil) 


static void wil_target_reset(struct wil6210_priv *wil)

{

	wil_dbg_MISC(wil, "Resetting...\n");

	wil_dbg_misc(wil, "Resetting...\n");



	/* register write */

#define W(a, v) iowrite32(v, wil->csr + HOSTADDR(a))
@@ -209,7 +209,7 @@ static void wil_target_reset(struct wil6210_priv *wil) 


	msleep(2000);



	wil_dbg_MISC(wil, "Reset completed\n");

	wil_dbg_misc(wil, "Reset completed\n");



#undef W

#undef S
@@ -232,7 +232,7 @@ static int wil_wait_for_fw_ready(struct wil6210_priv *wil) 
		wil_err(wil, "Firmware not ready\n");

		return -ETIME;

	} else {

		wil_dbg_MISC(wil, "FW ready after %d ms\n",

		wil_dbg_misc(wil, "FW ready after %d ms\n",

			     jiffies_to_msecs(to-left));

	}

	return 0;
@@ -281,7 +281,7 @@ void wil_link_on(struct wil6210_priv *wil) 
{

	struct net_device *ndev = wil_to_ndev(wil);



	wil_dbg_MISC(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "%s()\n", __func__);



	netif_carrier_on(ndev);

	netif_tx_wake_all_queues(ndev);
@@ -291,7 +291,7 @@ void wil_link_off(struct wil6210_priv *wil) 
{

	struct net_device *ndev = wil_to_ndev(wil);



	wil_dbg_MISC(wil, "%s()\n", __func__);

	wil_dbg_misc(wil, "%s()\n", __func__);



	netif_tx_stop_all_queues(ndev);

	netif_carrier_off(ndev);
@@ -314,27 +314,27 @@ static int __wil_up(struct wil6210_priv *wil) 
	wmi_nettype = wil_iftype_nl2wmi(NL80211_IFTYPE_ADHOC);

	switch (wdev->iftype) {

	case NL80211_IFTYPE_STATION:

		wil_dbg_MISC(wil, "type: STATION\n");

		wil_dbg_misc(wil, "type: STATION\n");

		bi = 0;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_AP:

		wil_dbg_MISC(wil, "type: AP\n");

		wil_dbg_misc(wil, "type: AP\n");

		bi = 100;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_P2P_CLIENT:

		wil_dbg_MISC(wil, "type: P2P_CLIENT\n");

		wil_dbg_misc(wil, "type: P2P_CLIENT\n");

		bi = 0;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_P2P_GO:

		wil_dbg_MISC(wil, "type: P2P_GO\n");

		wil_dbg_misc(wil, "type: P2P_GO\n");

		bi = 100;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_MONITOR:

		wil_dbg_MISC(wil, "type: Monitor\n");

		wil_dbg_misc(wil, "type: Monitor\n");

		bi = 0;

		ndev->type = ARPHRD_IEEE80211_RADIOTAP;

		/* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_RADIOTAP ? */

drivers/net/wireless/ath/wil6210/pcie_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) 
	}

	wil->n_msi = use_msi;

	if (wil->n_msi) {

		wil_dbg_MISC(wil, "Setup %d MSI interrupts\n", use_msi);

		wil_dbg_misc(wil, "Setup %d MSI interrupts\n", use_msi);

		rc = pci_enable_msi_block(pdev, wil->n_msi);

		if (rc && (wil->n_msi == 3)) {

			wil_err(wil, "3 MSI mode failed, try 1 MSI\n");
@@ -65,7 +65,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) 
			wil->n_msi = 0;

		}

	} else {

		wil_dbg_MISC(wil, "MSI interrupts disabled, use INTx\n");

		wil_dbg_misc(wil, "MSI interrupts disabled, use INTx\n");

	}



	rc = wil6210_init_irq(wil, pdev->irq);

drivers/net/wireless/ath/wil6210/txrx.c

+15 −15
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring) 
		d->dma.status = TX_DMA_STATUS_DU;

	}



	wil_dbg_MISC(wil, "vring[%d] 0x%p:0x%016llx 0x%p\n", vring->size,

	wil_dbg_misc(wil, "vring[%d] 0x%p:0x%016llx 0x%p\n", vring->size,

		     vring->va, (unsigned long long)vring->pa, vring->ctx);



	return 0;
@@ -353,8 +353,8 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil, 
	if (ndev->type == ARPHRD_IEEE80211_RADIOTAP)

		wil_rx_add_radiotap_header(wil, skb, d);



	wil_dbg_TXRX(wil, "Rx[%3d] : %d bytes\n", vring->swhead, d->dma.length);

	wil_hex_dump_TXRX("Rx ", DUMP_PREFIX_NONE, 32, 4,

	wil_dbg_txrx(wil, "Rx[%3d] : %d bytes\n", vring->swhead, d->dma.length);

	wil_hex_dump_txrx("Rx ", DUMP_PREFIX_NONE, 32, 4,

			  (const void *)d, sizeof(*d), false);



	wil_vring_advance_head(vring, 1);
@@ -369,7 +369,7 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil, 
	 */

	ftype = wil_rxdesc_ftype(d) << 2;

	if (ftype != IEEE80211_FTYPE_DATA) {

		wil_dbg_TXRX(wil, "Non-data frame ftype 0x%08x\n", ftype);

		wil_dbg_txrx(wil, "Non-data frame ftype 0x%08x\n", ftype);

		/* TODO: process it */

		kfree_skb(skb);

		return NULL;
@@ -461,9 +461,9 @@ void wil_rx_handle(struct wil6210_priv *wil) 
		wil_err(wil, "Rx IRQ while Rx not yet initialized\n");

		return;

	}

	wil_dbg_TXRX(wil, "%s()\n", __func__);

	wil_dbg_txrx(wil, "%s()\n", __func__);

	while (NULL != (skb = wil_vring_reap_rx(wil, v))) {

		wil_hex_dump_TXRX("Rx ", DUMP_PREFIX_OFFSET, 16, 1,

		wil_hex_dump_txrx("Rx ", DUMP_PREFIX_OFFSET, 16, 1,

				  skb->data, skb_headlen(skb), false);



		if (wil->wdev->iftype == NL80211_IFTYPE_MONITOR) {
@@ -639,7 +639,7 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring, 
	uint i = swhead;

	dma_addr_t pa;



	wil_dbg_TXRX(wil, "%s()\n", __func__);

	wil_dbg_txrx(wil, "%s()\n", __func__);



	if (avail < vring->size/8)

		netif_tx_stop_all_queues(wil_to_ndev(wil));
@@ -656,9 +656,9 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring, 
	pa = dma_map_single(dev, skb->data,

			skb_headlen(skb), DMA_TO_DEVICE);



	wil_dbg_TXRX(wil, "Tx skb %d bytes %p -> %#08llx\n", skb_headlen(skb),

	wil_dbg_txrx(wil, "Tx skb %d bytes %p -> %#08llx\n", skb_headlen(skb),

		     skb->data, (unsigned long long)pa);

	wil_hex_dump_TXRX("Tx ", DUMP_PREFIX_OFFSET, 16, 1,

	wil_hex_dump_txrx("Tx ", DUMP_PREFIX_OFFSET, 16, 1,

			  skb->data, skb_headlen(skb), false);



	if (unlikely(dma_mapping_error(dev, pa)))
@@ -687,12 +687,12 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring, 
	d->dma.d0 |= BIT(DMA_CFG_DESC_TX_0_CMD_DMA_IT_POS);

	d->dma.d0 |= (vring_index << DMA_CFG_DESC_TX_0_QID_POS);



	wil_hex_dump_TXRX("Tx ", DUMP_PREFIX_NONE, 32, 4,

	wil_hex_dump_txrx("Tx ", DUMP_PREFIX_NONE, 32, 4,

			  (const void *)d, sizeof(*d), false);



	/* advance swhead */

	wil_vring_advance_head(vring, nr_frags + 1);

	wil_dbg_TXRX(wil, "Tx swhead %d -> %d\n", swhead, vring->swhead);

	wil_dbg_txrx(wil, "Tx swhead %d -> %d\n", swhead, vring->swhead);

	iowrite32(vring->swhead, wil->csr + HOSTADDR(vring->hwtail));

	/* hold reference to skb

	 * to prevent skb release before accounting
@@ -725,7 +725,7 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
	struct vring *vring;

	int rc;



	wil_dbg_TXRX(wil, "%s()\n", __func__);

	wil_dbg_txrx(wil, "%s()\n", __func__);

	if (!test_bit(wil_status_fwready, &wil->status)) {

		wil_err(wil, "FW not ready\n");

		goto drop;
@@ -785,7 +785,7 @@ void wil_tx_complete(struct wil6210_priv *wil, int ringid) 
		return;

	}



	wil_dbg_TXRX(wil, "%s(%d)\n", __func__, ringid);

	wil_dbg_txrx(wil, "%s(%d)\n", __func__, ringid);



	while (!wil_vring_is_empty(vring)) {

		volatile struct vring_tx_desc *d = &vring->va[vring->swtail].tx;
@@ -794,11 +794,11 @@ void wil_tx_complete(struct wil6210_priv *wil, int ringid) 
		if (!(d->dma.status & TX_DMA_STATUS_DU))

			break;



		wil_dbg_TXRX(wil,

		wil_dbg_txrx(wil,

			     "Tx[%3d] : %d bytes, status 0x%02x err 0x%02x\n",

			     vring->swtail, d->dma.length, d->dma.status,

			     d->dma.error);

		wil_hex_dump_TXRX("TxC ", DUMP_PREFIX_NONE, 32, 4,

		wil_hex_dump_txrx("TxC ", DUMP_PREFIX_NONE, 32, 4,

				  (const void *)d, sizeof(*d), false);



		pa = d->dma.addr_low | ((u64)d->dma.addr_high << 32);