OSDN Git Service

staging: r8712u: delete unnecessary field initialization
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sat, 15 Feb 2014 07:36:11 +0000 (08:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Feb 2014 20:32:55 +0000 (12:32 -0800)
On success, the function netdev_alloc_skb initializes the dev field of its
result to its first argument, so this doesn't have to be done in the
calling context.

The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression skb,privn,e;
@@

skb = netdev_alloc_skb(privn,...);
... when strict
(
-skb->dev = privn;
|
?skb = e
)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/rtl8712_recv.c

index ea96537..0723b2f 100644 (file)
@@ -90,7 +90,6 @@ int r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter)
                pskb = netdev_alloc_skb(padapter->pnetdev, MAX_RECVBUF_SZ +
                       RECVBUFF_ALIGN_SZ);
                if (pskb) {
-                       pskb->dev = padapter->pnetdev;
                        tmpaddr = (addr_t)pskb->data;
                        alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
                        skb_reserve(pskb, (RECVBUFF_ALIGN_SZ - alignment));
@@ -1083,7 +1082,6 @@ static int recvbuf2recvframe(struct _adapter *padapter, struct sk_buff *pskb)
                alloc_sz += 6;
                pkt_copy = netdev_alloc_skb(padapter->pnetdev, alloc_sz);
                if (pkt_copy) {
-                       pkt_copy->dev = padapter->pnetdev;
                        precvframe->u.hdr.pkt = pkt_copy;
                        skb_reserve(pkt_copy, 4 - ((addr_t)(pkt_copy->data)
                                    % 4));