[PATCH 0/5] staging: csr: Cleanup driver

Hi kernel guys!

This patchset aims to clean a little the csr driver by removing dead code and
unused/commented macros.

All the macros and dead code was reported by the forgotten-macros tool
(https://github.com/marcosps/forgotten_macros).

This patchset is against staging-next.

I hope you like it

Marcos Paulo de Souza (5):
staging: csr: Remove dead code
staging: csr: csr_util.h: Remove commented macros
staging: csr: netdev.c: Remove unused macros
staging: csr: unifi_sme.c: Remove unused macros
staging: csr: Remove unused macros

drivers/staging/csr/csr_util.h | 7 ---
drivers/staging/csr/csr_wifi_hip_card_sdio.c | 3 --
drivers/staging/csr/drv.c | 1 -
drivers/staging/csr/firmware.c | 1 -
drivers/staging/csr/mlme.c | 5 ---
drivers/staging/csr/monitor.c | 59 --------------------------
drivers/staging/csr/netdev.c | 5 ---
drivers/staging/csr/sme_sys.c | 1 -
drivers/staging/csr/unifi_native.h | 19 ---------
drivers/staging/csr/unifi_sme.c | 6 ---
10 files changed, 107 deletions(-)

--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]

All this code is dead, so remove it.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/csr/monitor.c | 57 ------------------------------------
drivers/staging/csr/unifi_native.h | 19 ------------
2 files changed, 76 deletions(-)

diff --git a/drivers/staging/csr/monitor.c b/drivers/staging/csr/monitor.c
index 7648d2b..8c35b7e 100644
--- a/drivers/staging/csr/monitor.c
+++ b/drivers/staging/csr/monitor.c
@@ -51,13 +51,6 @@ uf_start_sniff(unifi_priv_t *priv)
req->Channel = priv->wext_conf.channel;
req->ChannelStartingFactor = 0;

-#if 0
- printk("SniffJoin: Ifindex=%d, Channel=%d, ChannelStartingFactor=%d\n",
- req->Ifindex,
- req->Channel,
- req->ChannelStartingFactor);
-#endif
-
signal.SignalPrimitiveHeader.SignalId = CSR_MLME_SNIFFJOIN_REQUEST_ID;

r = unifi_mlme_blocking_request(priv, pcli, &signal, NULL, timeout);
@@ -198,11 +191,6 @@ netrx_radiotap(unifi_priv_t *priv,
unifi_rt->rt_antenna = ind->AntennaId;


-#if 0
- printk("skb datalen=%d\n", skb->len);
- dump(skb->data, 48);
-#endif
-
skb->dev = dev;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
skb->mac_header = skb->data;
@@ -282,24 +270,6 @@ netrx_prism(unifi_priv_t *priv,
return;
}

-#if 0
- printk("MA-SINFFDATA.ind: DataLen=%d bytes, TSF %02X %02X %02X %02X %02X %02X %02X %02X, Rate=%d, Antenna=%d\n",
- ind->Data.DataLength,
- ind->Timestamp.x[0],
- ind->Timestamp.x[1],
- ind->Timestamp.x[2],
- ind->Timestamp.x[3],
- ind->Timestamp.x[4],
- ind->Timestamp.x[5],
- ind->Timestamp.x[6],
- ind->Timestamp.x[7],
- ind->Rate,
- ind->Antenna);
-
- printk("payload, len %d\n", length);
- dump((unsigned char *)payload, 32);
-#endif
-
/*
* Allocate a SKB for the received data packet, including radiotap
* header.
@@ -341,11 +311,6 @@ netrx_prism(unifi_priv_t *priv,
avs->encoding = htonl(0); /* unknown */


-#if 0
- printk("skb datalen=%d\n", skb->len);
- dump(skb->data, 48);
-#endif
-
skb->dev = dev;
skb->mac.raw = skb->data;
skb->pkt_type = PACKET_OTHERHOST;
@@ -402,33 +367,11 @@ ma_sniffdata_ind(void *ospriv,
}

skb->len = bulkdata->d[0].data_length;
-#if 0
- printk("MA-SNIFFDATA.ind: DataLen=%d bytes, TSF %02X %02X %02X %02X %02X %02X %02X %02X, Rate=%d, Antenna=%d\n",
- ind->Data.DataLength,
- ind->Timestamp.x[0],
- ind->Timestamp.x[1],
- ind->Timestamp.x[2],
- ind->Timestamp.x[3],
- ind->Timestamp.x[4],
- ind->Timestamp.x[5],
- ind->Timestamp.x[6],
- ind->Timestamp.x[7],
- ind->Rate,
- ind->AntennaId);
-
- printk("payload, len %lu\n", bulkdata->d[0].data_length);
- if (bulkdata->d[0].os_data_ptr && (bulkdata->d[0].data_length >= 32)) {
- dump((unsigned char *)bulkdata->d[0].os_data_ptr, 32);
- }
-#endif

/* We only process data packets if the interface is open */
if (unlikely(!netif_running(dev))) {
priv->stats.rx_dropped++;
priv->wext_conf.wireless_stats.discard.misc++;
-#if 0
- printk("Dropping packet while interface is not up.\n";
-#endif
dev_kfree_skb(skb);
return;
}
diff --git a/drivers/staging/csr/unifi_native.h b/drivers/staging/csr/unifi_native.h
index a480c9e..a73b38e 100644
--- a/drivers/staging/csr/unifi_native.h
+++ b/drivers/staging/csr/unifi_native.h
@@ -242,25 +242,6 @@ void uf_native_process_udi_signal(ul_client_t *pcli,
const u8 *packed_signal,
int packed_signal_len,
const bulk_data_param_t *bulkdata, int dir);
-#if 0
-/*
- * Choose one of these if available in linux/if_arp.h:
- * #define UNIFI_SNIFF_ARPHRD ARPHRD_IEEE80211_RADIOTAP
- * #define UNIFI_SNIFF_ARPHRD ARPHRD_IEEE80211_PRISM
- *
- * Radiotap is the newer standard for softmac WLAN devices, it works with
- * Wireshark but not Ethereal (due to a bug in the Ethereal dissector).
- * Prism is an older (less desirable) format but it does work with Ethereal.
- */
-#ifdef ARPHRD_IEEE80211_RADIOTAP
-#define UNIFI_SNIFF_ARPHRD ARPHRD_IEEE80211_RADIOTAP
-#else
-#ifdef ARPHRD_IEEE80211_PRISM
-#define UNIFI_SNIFF_ARPHRD ARPHRD_IEEE80211_PRISM
-#endif
-#endif
-#endif
-
#ifdef UNIFI_SNIFF_ARPHRD
/*
* monitor.c
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]

These macros are not used, so remove it.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/csr/csr_wifi_hip_card_sdio.c | 3 ---
drivers/staging/csr/drv.c | 1 -
drivers/staging/csr/firmware.c | 1 -
drivers/staging/csr/mlme.c | 5 -----
drivers/staging/csr/monitor.c | 2 --
drivers/staging/csr/sme_sys.c | 1 -
6 files changed, 13 deletions(-)

diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c
index 91976b8..5a86ff9 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c
@@ -36,9 +36,6 @@
#define MAILBOX2_TIMEOUT 5 /* in millisecs */
#define MAILBOX2_ATTEMPTS 10 /* 50ms */

-#define MAILBOX2_RESET_ATTEMPTS 10
-#define MAILBOX2_RESET_TIMEOUT 5 /* in millisecs */
-
#define RESET_SETTLE_DELAY 25 /* in millisecs */

static CsrResult card_init_slots(card_t *card);
diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c
index fbe8630..4be6d95 100644
--- a/drivers/staging/csr/drv.c
+++ b/drivers/staging/csr/drv.c
@@ -63,7 +63,6 @@ int coredump_max = CSR_WIFI_HIP_NUM_COREDUMP_BUFFERS;
int run_bh_once = -1; /* Set for scheduled interrupt mode, -1 = default */
int bh_priority = -1;
#ifdef CSR_WIFI_HIP_DEBUG_OFFLINE
-#define UNIFI_LOG_HIP_SIGNALS_FILTER_SIGNAL (1 << 0)
#define UNIFI_LOG_HIP_SIGNALS_FILTER_BULKDATA (1 << 1)
#define UNIFI_LOG_HIP_SIGNALS_FILTER_TIMESTAMP (1 << 2)
int log_hip_signals = 0;
diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c
index 03da0d5..98e27d6 100644
--- a/drivers/staging/csr/firmware.c
+++ b/drivers/staging/csr/firmware.c
@@ -220,7 +220,6 @@ unifi_fw_read(void *ospriv, void *arg, CsrUint32 offset, void *buf, CsrUint32 le



-#define UNIFIHELPER_INIT_MODE_SMEEMB 0
#define UNIFIHELPER_INIT_MODE_SMEUSER 2
#define UNIFIHELPER_INIT_MODE_NATIVE 1

diff --git a/drivers/staging/csr/mlme.c b/drivers/staging/csr/mlme.c
index 790d5d7..ed767ec 100644
--- a/drivers/staging/csr/mlme.c
+++ b/drivers/staging/csr/mlme.c
@@ -15,11 +15,6 @@
#include "csr_wifi_hip_unifi.h"
#include "unifi_priv.h"

-
-/* The additional time taken by the UniFi to do a scan per channel */
-#define SCAN_STARTUP_TIME 300 /* in millisecs */
-
-
/*
* ---------------------------------------------------------------------------
* unifi_mlme_wait_for_reply
diff --git a/drivers/staging/csr/monitor.c b/drivers/staging/csr/monitor.c
index 8c35b7e..628782a 100644
--- a/drivers/staging/csr/monitor.c
+++ b/drivers/staging/csr/monitor.c
@@ -242,9 +242,7 @@ netrx_prism(unifi_priv_t *priv,
unsigned char *ptr;
unsigned char *base;
int ind_data_len = skb_orig->len - 2 - ETH_HLEN;
-#define WLANCAP_MAGIC_COOKIE_BASE 0x80211000
#define WLANCAP_MAGIC_COOKIE_V1 0x80211001
-#define WLANCAP_MAGIC_COOKIE_V2 0x80211002
struct avs_header_v1 {
uint32 version;
uint32 length;
diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c
index 9c3aa74..5f38f9d 100644
--- a/drivers/staging/csr/sme_sys.c
+++ b/drivers/staging/csr/sme_sys.c
@@ -1572,7 +1572,6 @@ void CsrWifiRouterMaPacketReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
r = _sys_packet_req(priv, &signal, mareq->subscriptionHandle,
mareq->frameLength, mareq->frame, snap_protocol);

-#define MAX_RETRY 2
if (r && mareq->cfmRequested)
{
CsrWifiRouterMaPacketCfmSend(msg->source,interfaceTag,
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]

These macros are not used, so remove it.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/csr/unifi_sme.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c
index 6e7cbbf..5ad1d5f 100644
--- a/drivers/staging/csr/unifi_sme.c
+++ b/drivers/staging/csr/unifi_sme.c
@@ -78,12 +78,6 @@ sme_log_event(ul_client_t *pcli,
CsrResult result = CSR_RESULT_SUCCESS;
int r;

- /* Following bits are encoded in hostTag These are there to ensure that hostTags are unique*/
-#define CSR_SME_DATA 0x00000000 /* Frames Sent by SME */
-#define CSR_PAL_DATA 0X10000000 /* Frames Sent by PAL-D*/
-#define CSR_NME_DATA 0x20000000 /* Frames Sent by NME*/
-#define APPLICATION_DATA 0x30000000 /* Frames Sent by Application*/
-
func_enter();
/* Just a sanity check */
if ((signal == NULL) || (signal_len <= 0)) {
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]

These macros are not used, so we can remove it.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/csr/netdev.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
index cf19f11..55149df 100644
--- a/drivers/staging/csr/netdev.c
+++ b/drivers/staging/csr/netdev.c
@@ -70,11 +70,6 @@
*/
#define ALLOW_Q_PAUSE

-#define ieee2host16(n) __le16_to_cpu(n)
-#define ieee2host32(n) __le32_to_cpu(n)
-#define host2ieee16(n) __cpu_to_le16(n)
-#define host2ieee32(n) __cpu_to_le32(n)
-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
#ifdef UNIFI_NET_NAME
#define UF_ALLOC_NETDEV(_dev, _size, _name, _setup, _num_of_queues) \
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]

All these macros are commented, so we can removed it.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/csr/csr_util.h | 7 -------
1 file changed, 7 deletions(-)

diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
index ce39c7e..5cd6cb4 100644
--- a/drivers/staging/csr/csr_util.h
+++ b/drivers/staging/csr/csr_util.h
@@ -47,17 +47,10 @@ void CsrUInt32ToHex(CsrUint32 number, CsrCharString *str);
#define CsrMemCmp(s1, s2, n) ((CsrInt32) memcmp((s1), (s2), (n)))
#define CsrStrCmp(s1, s2) ((CsrInt32) strcmp((s1), (s2)))
#define CsrStrNCmp(s1, s2, n) ((CsrInt32) strncmp((s1), (s2), (n)))
-/*#define CsrMemChr memchr*/
#define CsrStrChr strchr
-/*#define CsrStrCSpn strcspn*/
-/*#define CsrStrPBrk strpbrk*/
-/*#define CsrStrRChr strrchr*/
-/*#define CsrStrSpn strspn*/
#define CsrStrStr strstr
-/*#define CsrStrTok strtok*/
#define CsrMemSet memset
#define CsrStrLen strlen
-/*#define CsrVsnprintf(s, n, format, arg) ((CsrInt32) vsnprintf((s), (n), (format), (arg)))*/
#else /* !CSR_USE_STDC_LIB */
void *CsrMemCpy(void *dest, const void *src, CsrSize count);
void *CsrMemMove(void *dest, const void *src, CsrSize count);
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at [vger.kernel.org]
Please read the FAQ at [www.tux.org]