From f8eb35fbe18d33c313e8fd7b151c3b3dbb527683 Mon Sep 17 00:00:00 2001
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Date: Mon, 28 Jan 2013 18:31:07 +0200
Subject: [PATCH] --- yaml --- r: 352324 b: refs/heads/master c:
 afda8bb50b950b5ee598e3dd0388b06ad1226eed h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/wireless/ath/wil6210/cfg80211.c  | 1 -
 trunk/drivers/net/wireless/ath/wil6210/interrupt.c | 1 -
 trunk/drivers/net/wireless/ath/wil6210/main.c      | 4 ++--
 trunk/drivers/net/wireless/ath/wil6210/netdev.c    | 4 ++--
 trunk/drivers/net/wireless/ath/wil6210/txrx.c      | 3 +--
 trunk/drivers/net/wireless/ath/wil6210/wmi.c       | 1 -
 7 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 1cb29ce9bd19..c4ff0165b0bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7743882d6f59b675809b59b5ac570677c94c426f
+refs/heads/master: afda8bb50b950b5ee598e3dd0388b06ad1226eed
diff --git a/trunk/drivers/net/wireless/ath/wil6210/cfg80211.c b/trunk/drivers/net/wireless/ath/wil6210/cfg80211.c
index 4b48f2ee1b68..002851fceb2f 100644
--- a/trunk/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/trunk/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -204,7 +204,6 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
 		break;
 	default:
 		return -EOPNOTSUPP;
-
 	}
 
 	/* FW don't support scan after connection attempt */
diff --git a/trunk/drivers/net/wireless/ath/wil6210/interrupt.c b/trunk/drivers/net/wireless/ath/wil6210/interrupt.c
index 865c33f1b1ce..dc97e7b2609c 100644
--- a/trunk/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/trunk/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -52,7 +52,6 @@
 
 static inline void wil_icr_clear(u32 x, void __iomem *addr)
 {
-
 }
 #else /* defined(CONFIG_WIL6210_ISR_COR) */
 /* configure to Write-1-to-Clear mode */
diff --git a/trunk/drivers/net/wireless/ath/wil6210/main.c b/trunk/drivers/net/wireless/ath/wil6210/main.c
index d160ea84e76a..761c389586d4 100644
--- a/trunk/drivers/net/wireless/ath/wil6210/main.c
+++ b/trunk/drivers/net/wireless/ath/wil6210/main.c
@@ -80,7 +80,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid)
 					GFP_KERNEL);
 		break;
 	default:
-		;
+		break;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(wil->vring_tx); i++)
@@ -357,7 +357,7 @@ static int __wil_up(struct wil6210_priv *wil)
 			wmi_set_channel(wil, channel->hw_value);
 		break;
 	default:
-		;
+		break;
 	}
 
 	/* MAC address - pre-requisite for other commands */
diff --git a/trunk/drivers/net/wireless/ath/wil6210/netdev.c b/trunk/drivers/net/wireless/ath/wil6210/netdev.c
index 073dc7d39259..8ce2e33dce20 100644
--- a/trunk/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/trunk/drivers/net/wireless/ath/wil6210/netdev.c
@@ -39,8 +39,8 @@ static const struct net_device_ops wil_netdev_ops = {
 	.ndo_open		= wil_open,
 	.ndo_stop		= wil_stop,
 	.ndo_start_xmit		= wil_start_xmit,
-	.ndo_set_mac_address    = eth_mac_addr,
-	.ndo_validate_addr      = eth_validate_addr,
+	.ndo_set_mac_address	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
 };
 
 void *wil_if_alloc(struct device *dev, void __iomem *csr)
diff --git a/trunk/drivers/net/wireless/ath/wil6210/txrx.c b/trunk/drivers/net/wireless/ath/wil6210/txrx.c
index f0d091313805..48cfa7e13781 100644
--- a/trunk/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/trunk/drivers/net/wireless/ath/wil6210/txrx.c
@@ -758,8 +758,7 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 	case -ENOMEM:
 		return NETDEV_TX_BUSY;
 	default:
-		; /* goto drop; */
-		break;
+		break; /* goto drop; */
 	}
  drop:
 	netif_tx_stop_all_queues(ndev);
diff --git a/trunk/drivers/net/wireless/ath/wil6210/wmi.c b/trunk/drivers/net/wireless/ath/wil6210/wmi.c
index 91f41a71d243..8178cc0ce650 100644
--- a/trunk/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/trunk/drivers/net/wireless/ath/wil6210/wmi.c
@@ -188,7 +188,6 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len)
 		wil_err(wil, "WMI size too large: %d bytes, max is %d\n",
 			(int)(sizeof(cmd) + len), r->entry_size);
 		return -ERANGE;
-
 	}
 
 	might_sleep();