ath9k: remove cast to void pointer

casting to void pointer from any pointer type and vice-versa is done
implicitly and therefore casting is not needed in such a case.

Done using Coccinellle.
Semantic Patch used :

@r@
expression x;
void* e;
type T;
identifier f;
@@

(
  *((T *)e)
|
  ((T *)x)[...]
|
  ((T *)x)->f
|
- (T *)
  e
)

Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index b3f20b3c02109e169d30bcef2fbcc621a6251277..e1fe7a7c3ad8f2ea3ad5040bc767da6cc9ade1c2 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -480,7 +480,7 @@ EXPORT_SYMBOL(ath9k_hw_addrxbuf_edma);
 int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
                                 void *buf_addr)
 {
-       struct ar9003_rxs *rxsp = (struct ar9003_rxs *) buf_addr;
+       struct ar9003_rxs *rxsp = buf_addr;
        unsigned int phyerr;
 
        if ((rxsp->status11 & AR_RxDone) == 0)
@@ -610,7 +610,7 @@ void ath9k_hw_setup_statusring(struct ath_hw *ah, void *ts_start,
        ah->ts_paddr_start = ts_paddr_start;
        ah->ts_paddr_end = ts_paddr_start + (size * sizeof(struct ar9003_txs));
        ah->ts_size = size;
-       ah->ts_ring = (struct ar9003_txs *) ts_start;
+       ah->ts_ring = ts_start;
 
        ath9k_hw_reset_txstatus_ring(ah);
 }

diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c
index 1ece42c2443d79e3d73e999b0ff5a6edb8b08fc7..40a397fd0e0eebdcd5e8d0f40f7cd4ed33be7b68 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/dfs.c
+++ b/drivers/net/wireless/ath/ath9k/dfs.c
@@ -326,7 +326,7 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
        if (ard.ext_rssi & 0x80)
                ard.ext_rssi = 0;
 
-       vdata_end = (char *)data + datalen;
+       vdata_end = data + datalen;
        ard.pulse_bw_info = vdata_end[-1];
        ard.pulse_length_ext = vdata_end[-2];
        ard.pulse_length_pri = vdata_end[-3];

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index c5f4dd808745a639556d8b0f10bc0af50ddbdaff..56676eaff24c186f323fc79330b061e3d74e6ae5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -424,7 +424,7 @@ static int hif_usb_send_tx(struct hif_device_usb *hif_dev, struct sk_buff *skb)
 
 static void hif_usb_start(void *hif_handle)
 {
-       struct hif_device_usb *hif_dev = (struct hif_device_usb *)hif_handle;
+       struct hif_device_usb *hif_dev = hif_handle;
        unsigned long flags;
 
        hif_dev->flags |= HIF_USB_START;
@@ -436,7 +436,7 @@ static void hif_usb_start(void *hif_handle)
 
 static void hif_usb_stop(void *hif_handle)
 {
-       struct hif_device_usb *hif_dev = (struct hif_device_usb *)hif_handle;
+       struct hif_device_usb *hif_dev = hif_handle;
        struct tx_buf *tx_buf = NULL, *tx_buf_tmp = NULL;
        unsigned long flags;
 
@@ -457,7 +457,7 @@ static void hif_usb_stop(void *hif_handle)
 
 static int hif_usb_send(void *hif_handle, u8 pipe_id, struct sk_buff *skb)
 {
-       struct hif_device_usb *hif_dev = (struct hif_device_usb *)hif_handle;
+       struct hif_device_usb *hif_dev = hif_handle;
        int ret = 0;
 
        switch (pipe_id) {
@@ -492,7 +492,7 @@ static inline bool check_index(struct sk_buff *skb, u8 idx)
 
 static void hif_usb_sta_drain(void *hif_handle, u8 idx)
 {
-       struct hif_device_usb *hif_dev = (struct hif_device_usb *)hif_handle;
+       struct hif_device_usb *hif_dev = hif_handle;
        struct sk_buff *skb, *tmp;
        unsigned long flags;
 

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 2c0e4d26e8f984605c13371a0c8bb6cc61982215..f20c839aeda229143daf2f5fd4ad38473d7c3e78 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -384,7 +384,7 @@ void ath9k_htc_set_tsfadjust(struct ath9k_htc_priv *priv,
 
 static void ath9k_htc_beacon_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
 {
-       bool *beacon_configured = (bool *)data;
+       bool *beacon_configured = data;
        struct ath9k_htc_vif *avp = (struct ath9k_htc_vif *) vif->drv_priv;
 
        if (vif->type == NL80211_IFTYPE_STATION &&

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index da2164b0cccc3890c100786c334d6c3cc3923ec8..57de6fa6ff03f6dc63cef6b02b18b17bb4d8f50b 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -233,7 +233,7 @@ static void ath9k_reg_notifier(struct wiphy *wiphy,
 
 static unsigned int ath9k_regread(void *hw_priv, u32 reg_offset)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
        __be32 val, reg = cpu_to_be32(reg_offset);
@@ -255,7 +255,7 @@ static unsigned int ath9k_regread(void *hw_priv, u32 reg_offset)
 static void ath9k_multi_regread(void *hw_priv, u32 *addr,
                                u32 *val, u16 count)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
        __be32 tmpaddr[8];
@@ -301,7 +301,7 @@ static void ath9k_regwrite_multi(struct ath_common *common)
 
 static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
        const __be32 buf[2] = {
@@ -322,7 +322,7 @@ static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset)
 
 static void ath9k_regwrite_buffer(void *hw_priv, u32 val, u32 reg_offset)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
 
@@ -345,7 +345,7 @@ static void ath9k_regwrite_buffer(void *hw_priv, u32 val, u32 reg_offset)
 
 static void ath9k_regwrite(void *hw_priv, u32 val, u32 reg_offset)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
 
@@ -357,7 +357,7 @@ static void ath9k_regwrite(void *hw_priv, u32 val, u32 reg_offset)
 
 static void ath9k_enable_regwrite_buffer(void *hw_priv)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
 
@@ -366,7 +366,7 @@ static void ath9k_enable_regwrite_buffer(void *hw_priv)
 
 static void ath9k_regwrite_flush(void *hw_priv)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
 
@@ -383,7 +383,7 @@ static void ath9k_regwrite_flush(void *hw_priv)
 static void ath9k_reg_rmw_buffer(void *hw_priv,
                                 u32 reg_offset, u32 set, u32 clr)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
        u32 rsp_status;
@@ -421,7 +421,7 @@ static void ath9k_reg_rmw_buffer(void *hw_priv,
 
 static void ath9k_reg_rmw_flush(void *hw_priv)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
        u32 rsp_status;
@@ -453,7 +453,7 @@ static void ath9k_reg_rmw_flush(void *hw_priv)
 
 static void ath9k_enable_rmw_buffer(void *hw_priv)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
 
@@ -466,7 +466,7 @@ static void ath9k_enable_rmw_buffer(void *hw_priv)
 static u32 ath9k_reg_rmw_single(void *hw_priv,
                                 u32 reg_offset, u32 set, u32 clr)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
        struct register_rmw buf, buf_ret;
@@ -490,7 +490,7 @@ static u32 ath9k_reg_rmw_single(void *hw_priv,
 
 static u32 ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
 

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index a553c91d41a143c90c374e6fff78131e835fb3a4..f808e5833d7e3217f476445e6a21db574b5cf394 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1483,7 +1483,7 @@ static void ath9k_htc_set_bssid(struct ath9k_htc_priv *priv)
 
 static void ath9k_htc_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
 {
-       struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *)data;
+       struct ath9k_htc_priv *priv = data;
        struct ath_common *common = ath9k_hw_common(priv->ah);
        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
 

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index b38a586ea59ad33c74255590a0f18bf807590e41..2682da02da54118e090b1391d8a2ddb1137ef274 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -641,7 +641,7 @@ static struct sk_buff* ath9k_htc_tx_get_packet(struct ath9k_htc_priv *priv,
 
 void ath9k_htc_txstatus(struct ath9k_htc_priv *priv, void *wmi_event)
 {
-       struct wmi_event_txstatus *txs = (struct wmi_event_txstatus *)wmi_event;
+       struct wmi_event_txstatus *txs = wmi_event;
        struct __wmi_event_txstatus *__txs;
        struct sk_buff *skb;
        struct ath9k_htc_tx_event *tx_pend;
@@ -684,7 +684,7 @@ void ath9k_htc_txstatus(struct ath9k_htc_priv *priv, void *wmi_event)
 void ath9k_htc_txep(void *drv_priv, struct sk_buff *skb,
                    enum htc_endpoint_id ep_id, bool txok)
 {
-       struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) drv_priv;
+       struct ath9k_htc_priv *priv = drv_priv;
        struct ath9k_htc_tx_ctl *tx_ctl;
        struct sk_buff_head *epid_queue;
 
@@ -1103,7 +1103,7 @@ requeue:
 void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,
                    enum htc_endpoint_id ep_id)
 {
-       struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *)drv_priv;
+       struct ath9k_htc_priv *priv = drv_priv;
        struct ath_hw *ah = priv->ah;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_htc_rxbuf *rxbuf = NULL, *tmp_buf = NULL;

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index bb7936090b915ae39e90a066dbf9e144d7e46758..4bc403620cf935635865d56569310ec37c9edaff 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -117,7 +117,7 @@ static const struct ath_ps_ops ath9k_ps_ops = {
 
 static void ath9k_iowrite32(void *hw_priv, u32 val, u32 reg_offset)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath_softc *sc = (struct ath_softc *) common->priv;
 
@@ -132,7 +132,7 @@ static void ath9k_iowrite32(void *hw_priv, u32 val, u32 reg_offset)
 
 static unsigned int ath9k_ioread32(void *hw_priv, u32 reg_offset)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath_softc *sc = (struct ath_softc *) common->priv;
        u32 val;
@@ -172,7 +172,7 @@ static unsigned int __ath9k_reg_rmw(struct ath_softc *sc, u32 reg_offset,
 
 static unsigned int ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)
 {
-       struct ath_hw *ah = (struct ath_hw *) hw_priv;
+       struct ath_hw *ah = hw_priv;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath_softc *sc = (struct ath_softc *) common->priv;
        unsigned long uninitialized_var(flags);
@@ -275,7 +275,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
        if (!dd->dd_desc)
                return -ENOMEM;
 
-       ds = (u8 *) dd->dd_desc;
+       ds = dd->dd_desc;
        ath_dbg(common, CONFIG, "%s DMA map: %p (%u) -> %llx (%u)\n",
                name, ds, (u32) dd->dd_desc_len,
                ito64(dd->dd_desc_paddr), /*XXX*/(u32) dd->dd_desc_len);

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 8b4ac7f0a09b70a78fc9b8b86bbd1cf0c990d7fb..9c24bc077e6bc201b66615c98fb0d09517a9b0dd 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1193,7 +1193,7 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
 
 static void ath9k_tpc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
 {
-       int *power = (int *)data;
+       int *power = data;
 
        if (*power < vif->bss_conf.txpower)
                *power = vif->bss_conf.txpower;

diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index cf23fd8152115837bc3ade74d9308c513cd0b027..39d46c203f6b78c1d9197887c09fc43950869b5f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -453,7 +453,7 @@ int ath_mci_setup(struct ath_softc *sc)
        mci->sched_buf.bf_len = ATH_MCI_SCHED_BUF_SIZE;
 
        mci->gpm_buf.bf_len = ATH_MCI_GPM_BUF_SIZE;
-       mci->gpm_buf.bf_addr = (u8 *)mci->sched_buf.bf_addr + mci->sched_buf.bf_len;
+       mci->gpm_buf.bf_addr = mci->sched_buf.bf_addr + mci->sched_buf.bf_len;
        mci->gpm_buf.bf_paddr = mci->sched_buf.bf_paddr + mci->sched_buf.bf_len;
 
        ret = ar9003_mci_setup(sc->sc_ah, mci->gpm_buf.bf_paddr,

diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index 64a354fa78ab2f79b7811e7119886f7c463473cc..b0b5579b756077aead50de45c017b75a393066e4 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -159,7 +159,7 @@ void ath9k_wmi_event_tasklet(unsigned long data)
 
                switch (cmd_id) {
                case WMI_SWBA_EVENTID:
-                       swba = (struct wmi_event_swba *) wmi_event;
+                       swba = wmi_event;
                        ath9k_htc_swba(priv, swba);
                        break;
                case WMI_FATAL_EVENTID:
@@ -207,7 +207,7 @@ static void ath9k_wmi_rsp_callback(struct wmi *wmi, struct sk_buff *skb)
 static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
                              enum htc_endpoint_id epid)
 {
-       struct wmi *wmi = (struct wmi *) priv;
+       struct wmi *wmi = priv;
        struct wmi_cmd_hdr *hdr;
        u16 cmd_id;