Skip to contentSkip to conversation

staging: rtl8712: rtl8712: fix sparse warnings

PATCH In review Carlos Palminha 2 participants 2 messages Feb 8, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: rtl8712: rtl8712: fix sparse warnings

Fixed sparse warnings
* No need to convert from le32, pointers for structure with same endianness (cast from restricted __le32)
* Need to convert bitwise operation for le32 structure (invalid assignment from int to __le32)

---
Changes v1->v2:
* Clarify patch description to ensure confidence

 drivers/staging/rtl8712/rtl8712_xmit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/rtl8712_xmit.c +4 -4
index c4f03a602a2e..67713643c923 100644
@@ -561,19 +561,19 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)
 
 			ptxdesc_mp = &txdesc_mp;
 			/* offset 8 */
-			ptxdesc->txdw2 = cpu_to_le32(ptxdesc_mp->txdw2);
+			ptxdesc->txdw2 = ptxdesc_mp->txdw2;
 			if (bmcst)
 				ptxdesc->txdw2 |= cpu_to_le32(BMC);
 			ptxdesc->txdw2 |= cpu_to_le32(BK);
 			/* offset 16 */
-			ptxdesc->txdw4 = cpu_to_le32(ptxdesc_mp->txdw4);
+			ptxdesc->txdw4 = ptxdesc_mp->txdw4;
 			/* offset 20 */
-			ptxdesc->txdw5 = cpu_to_le32(ptxdesc_mp->txdw5);
+			ptxdesc->txdw5 = ptxdesc_mp->txdw5;
 			pattrib->pctrl = 0;/* reset to zero; */
 		}
 	} else if (pxmitframe->frame_tag == MGNT_FRAMETAG) {
 		/* offset 4 */
-		ptxdesc->txdw1 |= (0x05) & 0x1f;/*CAM_ID(MAC_ID), default=5;*/
+		ptxdesc->txdw1 |= cpu_to_le32((0x05) & 0x1f);/*CAM_ID(MAC_ID), default=5;*/
 		qsel = (uint)(pattrib->qsel & 0x0000001f);
 		ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00);
 		ptxdesc->txdw1 |= cpu_to_le32(BIT(16));/* Non-QoS */

--
2.11.0

#1 lore raw
Quoted 17 lines · Carlos Palminha

Fixed sparse warnings
* No need to convert from le32, pointers for structure with same endianness (cast from restricted __le32)
* Need to convert bitwise operation for le32 structure (invalid assignment from int to __le32)

---
Changes v1->v2:
* Clarify patch description to ensure confidence

 drivers/staging/rtl8712/rtl8712_xmit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/rtl8712_xmit.c +0 -0
index c4f03a602a2e..67713643c923 100644

drivers/staging/rtl8712/rtl8712_xmit.c static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz) · line 564

Quoted 5 lines
drivers/staging/rtl8712/rtl8712_xmit.c +1 -1
@@ -561,19 +561,19 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz)
 
 			ptxdesc_mp = &txdesc_mp;
 			/* offset 8 */
-			ptxdesc->txdw2 = cpu_to_le32(ptxdesc_mp->txdw2);
+			ptxdesc->txdw2 = ptxdesc_mp->txdw2;

Nah... The original is done deliberately. When I'm reviewing this patch I can see that now.

Just leave this as-is.

regards,
dan carpenter