Skip to contentSkip to conversation

Staging: rtl8712: rtl8712_xmit: Remove unnecessary cast

PATCH Superseded Shivani Bhardwaj 2 participants 3 messages Oct 14, 2015 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8712: rtl8712_xmit: Remove unnecessary cast

Explicit typecasting of variables is not required and should be removed. Semantic patch used:
@@
type T;
T e;
identifier x;
@@

* T x = (T)e;

---
 drivers/staging/rtl8712/rtl8712_xmit.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8712/rtl8712_xmit.c +7 -7
index 86206d3..9e50bbf 100644
@@ -96,7 +96,7 @@ static u32 get_ff_hwaddr(struct xmit_frame *pxmitframe)
 	u32 addr = 0;
 	struct pkt_attrib *pattrib = &pxmitframe->attrib;
 	struct _adapter *padapter = pxmitframe->padapter;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 
 	if (pxmitframe->frame_tag == TXAGG_FRAMETAG)
 		addr = RTL8712_DMA_H2CCMD;
@@ -237,7 +237,7 @@ void r8712_do_queue_select(struct _adapter *padapter,
 			   struct pkt_attrib *pattrib)
 {
 	unsigned int qsel = 0;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 
 	if (pdvobj->nr_endpoint == 6)
 		qsel = (unsigned int) pattrib->priority;
@@ -374,8 +374,8 @@ u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
 			struct xmit_frame *pxmitframe)
 {
 	struct _adapter *padapter = pxmitframe->padapter;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *) &padapter->dvobjpriv;
-	struct tx_desc *ptxdesc = (struct tx_desc *)pxmitbuf->pbuf;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
+	struct tx_desc *ptxdesc   = pxmitbuf->pbuf;
 	struct cmd_hdr *pcmd_hdr = (struct cmd_hdr *)
 		(pxmitbuf->pbuf + TXDESC_SIZE);
 	u16 total_length = (u16) (ptxdesc->txdw0 & 0xffff);
@@ -419,10 +419,10 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)
 	struct qos_priv *pqospriv = &pmlmepriv->qospriv;
 	struct security_priv *psecuritypriv = &padapter->securitypriv;
 	struct pkt_attrib *pattrib = &pxmitframe->attrib;
-	struct tx_desc *ptxdesc = (struct tx_desc *)pmem;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+	struct tx_desc *ptxdesc    = (struct tx_desc *)pmem;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 #ifdef CONFIG_R8712_TX_AGGR
-	struct cmd_priv *pcmdpriv = (struct cmd_priv *)&padapter->cmdpriv;
+	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 #endif
 	u8 blnSetTxDescOffset;
 	sint bmcst = IS_MCAST(pattrib->ra);
Signature · 1 line
2.1.0
#1 lore raw
Quoted 38 lines · Shivani Bhardwaj

Explicit typecasting of variables is not required and should be removed. Semantic patch used:
@@
type T;
T e;
identifier x;
@@

* T x = (T)e;

---
 drivers/staging/rtl8712/rtl8712_xmit.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8712/rtl8712_xmit.c +2 -2
index 86206d3..9e50bbf 100644
@@ -96,7 +96,7 @@ static u32 get_ff_hwaddr(struct xmit_frame *pxmitframe)
 	u32 addr = 0;
 	struct pkt_attrib *pattrib = &pxmitframe->attrib;
 	struct _adapter *padapter = pxmitframe->padapter;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 
 	if (pxmitframe->frame_tag == TXAGG_FRAMETAG)
 		addr = RTL8712_DMA_H2CCMD;
@@ -237,7 +237,7 @@ void r8712_do_queue_select(struct _adapter *padapter,
 			   struct pkt_attrib *pattrib)
 {
 	unsigned int qsel = 0;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 
 	if (pdvobj->nr_endpoint == 6)
 		qsel = (unsigned int) pattrib->priority;

drivers/staging/rtl8712/rtl8712_xmit.c u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf, · line 378

Quoted 7 lines
drivers/staging/rtl8712/rtl8712_xmit.c +2 -2
@@ -374,8 +374,8 @@ u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
 			struct xmit_frame *pxmitframe)
 {
 	struct _adapter *padapter = pxmitframe->padapter;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *) &padapter->dvobjpriv;
-	struct tx_desc *ptxdesc = (struct tx_desc *)pxmitbuf->pbuf;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
+	struct tx_desc *ptxdesc   = pxmitbuf->pbuf;

It looks like you have added some space before the =. I don't think that is needed. It wasn't lined up with the previous declaration before, and it's not lined up with the = on the next line either.

julia

Quoted 27 lines
drivers/staging/rtl8712/rtl8712_xmit.c +3 -4
 	struct cmd_hdr *pcmd_hdr = (struct cmd_hdr *)
 		(pxmitbuf->pbuf + TXDESC_SIZE);
 	u16 total_length = (u16) (ptxdesc->txdw0 & 0xffff);
@@ -419,10 +419,10 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)
 	struct qos_priv *pqospriv = &pmlmepriv->qospriv;
 	struct security_priv *psecuritypriv = &padapter->securitypriv;
 	struct pkt_attrib *pattrib = &pxmitframe->attrib;
-	struct tx_desc *ptxdesc = (struct tx_desc *)pmem;
-	struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+	struct tx_desc *ptxdesc    = (struct tx_desc *)pmem;
+	struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 #ifdef CONFIG_R8712_TX_AGGR
-	struct cmd_priv *pcmdpriv = (struct cmd_priv *)&padapter->cmdpriv;
+	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 #endif
 	u8 blnSetTxDescOffset;
 	sint bmcst = IS_MCAST(pattrib->ra);
--

2.1.0

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151014122915.GA11874%40ubuntu.
For more options, visit https://groups.google.com/d/optout.

#2 lore raw
Quoted 54 lines · Julia Lawall
Quoted 38 lines · Shivani Bhardwaj

Explicit typecasting of variables is not required and should be removed. Semantic patch used:
@@
type T;
T e;
identifier x;
@@

* T x = (T)e;

---
 drivers/staging/rtl8712/rtl8712_xmit.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8712/rtl8712_xmit.c +2 -2
index 86206d3..9e50bbf 100644
@@ -96,7 +96,7 @@ static u32 get_ff_hwaddr(struct xmit_frame *pxmitframe)
      u32 addr = 0;
      struct pkt_attrib *pattrib = &pxmitframe->attrib;
      struct _adapter *padapter = pxmitframe->padapter;
-     struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+     struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 
      if (pxmitframe->frame_tag == TXAGG_FRAMETAG)
              addr = RTL8712_DMA_H2CCMD;
@@ -237,7 +237,7 @@ void r8712_do_queue_select(struct _adapter *padapter,
                         struct pkt_attrib *pattrib)
 {
      unsigned int qsel = 0;
-     struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+     struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 
      if (pdvobj->nr_endpoint == 6)
              qsel = (unsigned int) pattrib->priority;

drivers/staging/rtl8712/rtl8712_xmit.c u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf, · line 378

Quoted 7 lines
drivers/staging/rtl8712/rtl8712_xmit.c +2 -2
@@ -374,8 +374,8 @@ u8 r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf,
                      struct xmit_frame *pxmitframe)
 {
      struct _adapter *padapter = pxmitframe->padapter;
-     struct dvobj_priv *pdvobj = (struct dvobj_priv *) &padapter->dvobjpriv;
-     struct tx_desc *ptxdesc = (struct tx_desc *)pxmitbuf->pbuf;
+     struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
+     struct tx_desc *ptxdesc   = pxmitbuf->pbuf;

It looks like you have added some space before the =. I don't think that is needed. It wasn't lined up with the previous declaration before, and it's not lined up with the = on the next line either.

Quoted 2 lines

julia

I'm fixing that.
Thanks.

Quoted 27 lines
Quoted 27 lines
drivers/staging/rtl8712/rtl8712_xmit.c +3 -4
      struct cmd_hdr *pcmd_hdr = (struct cmd_hdr *)
              (pxmitbuf->pbuf + TXDESC_SIZE);
      u16 total_length = (u16) (ptxdesc->txdw0 & 0xffff);
@@ -419,10 +419,10 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)
      struct qos_priv *pqospriv = &pmlmepriv->qospriv;
      struct security_priv *psecuritypriv = &padapter->securitypriv;
      struct pkt_attrib *pattrib = &pxmitframe->attrib;
-     struct tx_desc *ptxdesc = (struct tx_desc *)pmem;
-     struct dvobj_priv *pdvobj = (struct dvobj_priv *)&padapter->dvobjpriv;
+     struct tx_desc *ptxdesc    = (struct tx_desc *)pmem;
+     struct dvobj_priv *pdvobj = &padapter->dvobjpriv;
 #ifdef CONFIG_R8712_TX_AGGR
-     struct cmd_priv *pcmdpriv = (struct cmd_priv *)&padapter->cmdpriv;
+     struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 #endif
      u8 blnSetTxDescOffset;
      sint bmcst = IS_MCAST(pattrib->ra);
--

2.1.0

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151014122915.GA11874%40ubuntu.
For more options, visit https://groups.google.com/d/optout.