aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorBhumika Goyal <bhumirks@gmail.com>2016-09-18 08:26:24 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-20 07:35:45 -0400
commitefdcb35a82fdd6e91b890efd3d5a5d4045e64c08 (patch)
tree407b2cda9034cf0e42e5344c9a1b3bc90fbcd107 /drivers/staging
parent182eec0eb75fc17455ff4d77f5e37ae4f0c5ea1c (diff)
Staging: rtl8192u: Remove useless type conversion
Some type conversions like casting a pointer to a pointer of same type, casting to the original type using addressof(&) operator etc. are not needed. Therefore, remove them. Done using coccinelle: @@ type t; t *p; t a; @@ ( - (t)(a) + a | - (t *)(p) + p | - (t *)(&a) + &a ) Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c6
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c10
-rw-r--r--drivers/staging/rtl8192u/r8192U_dm.c6
5 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 051c2be842d0..89cbc077a48d 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -1027,7 +1027,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
1027 ieee, 1027 ieee,
1028 (PTS_COMMON_INFO *) &pRxTS, 1028 (PTS_COMMON_INFO *) &pRxTS,
1029 hdr->addr2, 1029 hdr->addr2,
1030 (u8)Frame_QoSTID((u8 *)(skb->data)), 1030 Frame_QoSTID((u8 *)(skb->data)),
1031 RX_DIR, 1031 RX_DIR,
1032 true)) 1032 true))
1033 { 1033 {
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 49db1b75cd05..10a8040da8aa 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -806,7 +806,7 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
806 *(tag++) = 2; 806 *(tag++) = 2;
807 807
808 put_unaligned_le16(ieee->current_network.atim_window, 808 put_unaligned_le16(ieee->current_network.atim_window,
809 (u8 *)tag); 809 tag);
810 tag+=2; 810 tag+=2;
811 } 811 }
812 812
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 28737ec65186..98fbb6ef484d 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -354,7 +354,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
354 354
355 req = (struct rtl_80211_hdr_3addr *) skb->data; 355 req = (struct rtl_80211_hdr_3addr *) skb->data;
356 tag = (u8 *)req; 356 tag = (u8 *)req;
357 dst = (u8 *)(&req->addr2[0]); 357 dst = &req->addr2[0];
358 tag += sizeof(struct rtl_80211_hdr_3addr); 358 tag += sizeof(struct rtl_80211_hdr_3addr);
359 pDialogToken = tag + 2; //category+action 359 pDialogToken = tag + 2; //category+action
360 pBaParamSet = (PBA_PARAM_SET)(tag + 3); //+DialogToken 360 pBaParamSet = (PBA_PARAM_SET)(tag + 3); //+DialogToken
@@ -452,7 +452,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
452 } 452 }
453 rsp = (struct rtl_80211_hdr_3addr *)skb->data; 453 rsp = (struct rtl_80211_hdr_3addr *)skb->data;
454 tag = (u8 *)rsp; 454 tag = (u8 *)rsp;
455 dst = (u8 *)(&rsp->addr2[0]); 455 dst = &rsp->addr2[0];
456 tag += sizeof(struct rtl_80211_hdr_3addr); 456 tag += sizeof(struct rtl_80211_hdr_3addr);
457 pDialogToken = tag + 2; 457 pDialogToken = tag + 2;
458 pStatusCode = (u16 *)(tag + 3); 458 pStatusCode = (u16 *)(tag + 3);
@@ -590,7 +590,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
590 590
591 IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_BA, skb->data, skb->len); 591 IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_BA, skb->data, skb->len);
592 delba = (struct rtl_80211_hdr_3addr *)skb->data; 592 delba = (struct rtl_80211_hdr_3addr *)skb->data;
593 dst = (u8 *)(&delba->addr2[0]); 593 dst = &delba->addr2[0];
594 pDelBaParamSet = (PDELBA_PARAM_SET)&delba->payload[2]; 594 pDelBaParamSet = (PDELBA_PARAM_SET)&delba->payload[2];
595 595
596 if(pDelBaParamSet->field.Initiator == 1) 596 if(pDelBaParamSet->field.Initiator == 1)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index cdb64e3e0d18..c66e7cf608c0 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -4472,10 +4472,10 @@ static void rtl8192_query_rxphystatus(struct r8192_priv *priv,
4472 */ 4472 */
4473 pstats->SignalQuality = 4473 pstats->SignalQuality =
4474 precord_stats->SignalQuality = 4474 precord_stats->SignalQuality =
4475 (u8)(evm & 0xff); 4475 evm & 0xff;
4476 pstats->RxMIMOSignalQuality[i] = 4476 pstats->RxMIMOSignalQuality[i] =
4477 precord_stats->RxMIMOSignalQuality[i] = 4477 precord_stats->RxMIMOSignalQuality[i] =
4478 (u8)(evm & 0xff); 4478 evm & 0xff;
4479 } 4479 }
4480 4480
4481 4481
@@ -5010,8 +5010,7 @@ static int rtl8192_usb_probe(struct usb_interface *intf,
5010 5010
5011 dev->netdev_ops = &rtl8192_netdev_ops; 5011 dev->netdev_ops = &rtl8192_netdev_ops;
5012 5012
5013 dev->wireless_handlers = 5013 dev->wireless_handlers = &r8192_wx_handlers_def;
5014 (struct iw_handler_def *)&r8192_wx_handlers_def;
5015 5014
5016 dev->type = ARPHRD_ETHER; 5015 dev->type = ARPHRD_ETHER;
5017 5016
@@ -5219,7 +5218,8 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
5219 } else { 5218 } else {
5220 /* Key Material */ 5219 /* Key Material */
5221 if (KeyContent) { 5220 if (KeyContent) {
5222 write_nic_dword(dev, WCAMI, (u32)(*(KeyContent + i - 2))); 5221 write_nic_dword(dev, WCAMI,
5222 *(KeyContent + i - 2));
5223 write_nic_dword(dev, RWCAM, TargetCommand); 5223 write_nic_dword(dev, RWCAM, TargetCommand);
5224 } 5224 }
5225 } 5225 }
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index 1e0e53c9c314..9209aad0515e 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -150,7 +150,7 @@ void deinit_hal_dm(struct net_device *dev)
150#ifdef USB_RX_AGGREGATION_SUPPORT 150#ifdef USB_RX_AGGREGATION_SUPPORT
151void dm_CheckRxAggregation(struct net_device *dev) 151void dm_CheckRxAggregation(struct net_device *dev)
152{ 152{
153 struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev); 153 struct r8192_priv *priv = ieee80211_priv(dev);
154 PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo; 154 PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;
155 static unsigned long lastTxOkCnt; 155 static unsigned long lastTxOkCnt;
156 static unsigned long lastRxOkCnt; 156 static unsigned long lastRxOkCnt;
@@ -2346,7 +2346,7 @@ dm_CheckEdcaTurbo_EXIT:
2346 2346
2347static void dm_init_ctstoself(struct net_device *dev) 2347static void dm_init_ctstoself(struct net_device *dev)
2348{ 2348{
2349 struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev); 2349 struct r8192_priv *priv = ieee80211_priv(dev);
2350 2350
2351 priv->ieee80211->bCTSToSelfEnable = true; 2351 priv->ieee80211->bCTSToSelfEnable = true;
2352 priv->ieee80211->CTSToSelfTH = CTSToSelfTHVal; 2352 priv->ieee80211->CTSToSelfTH = CTSToSelfTHVal;
@@ -2354,7 +2354,7 @@ static void dm_init_ctstoself(struct net_device *dev)
2354 2354
2355static void dm_ctstoself(struct net_device *dev) 2355static void dm_ctstoself(struct net_device *dev)
2356{ 2356{
2357 struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev); 2357 struct r8192_priv *priv = ieee80211_priv(dev);
2358 PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo; 2358 PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;
2359 static unsigned long lastTxOkCnt; 2359 static unsigned long lastTxOkCnt;
2360 static unsigned long lastRxOkCnt; 2360 static unsigned long lastRxOkCnt;