diff options
author | yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn> | 2017-06-18 10:52:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-20 13:30:15 -0400 |
commit | b952f4dff2751252db073c27c0f8a16a416a2ddc (patch) | |
tree | fda132505741ee4d859ae09f45966656ea557572 /drivers/net/caif | |
parent | ad941e693b24ad8b13c28382d323552ef6fb434b (diff) |
net: manual clean code which call skb_put_[data:zero]
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/caif')
-rw-r--r-- | drivers/net/caif/caif_hsi.c | 6 | ||||
-rw-r--r-- | drivers/net/caif/caif_serial.c | 3 | ||||
-rw-r--r-- | drivers/net/caif/caif_spi.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 4534326e20ac..11ba6e3eea22 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c | |||
@@ -426,7 +426,6 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi) | |||
426 | /* Check for embedded CAIF frame. */ | 426 | /* Check for embedded CAIF frame. */ |
427 | if (desc->offset) { | 427 | if (desc->offset) { |
428 | struct sk_buff *skb; | 428 | struct sk_buff *skb; |
429 | u8 *dst = NULL; | ||
430 | int len = 0; | 429 | int len = 0; |
431 | pfrm = ((u8 *)desc) + desc->offset; | 430 | pfrm = ((u8 *)desc) + desc->offset; |
432 | 431 | ||
@@ -454,7 +453,7 @@ static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi) | |||
454 | } | 453 | } |
455 | caif_assert(skb != NULL); | 454 | caif_assert(skb != NULL); |
456 | 455 | ||
457 | dst = skb_put_data(skb, pfrm, len); | 456 | skb_put_data(skb, pfrm, len); |
458 | 457 | ||
459 | skb->protocol = htons(ETH_P_CAIF); | 458 | skb->protocol = htons(ETH_P_CAIF); |
460 | skb_reset_mac_header(skb); | 459 | skb_reset_mac_header(skb); |
@@ -555,7 +554,6 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi) | |||
555 | /* Parse payload. */ | 554 | /* Parse payload. */ |
556 | while (nfrms < CFHSI_MAX_PKTS && *plen) { | 555 | while (nfrms < CFHSI_MAX_PKTS && *plen) { |
557 | struct sk_buff *skb; | 556 | struct sk_buff *skb; |
558 | u8 *dst = NULL; | ||
559 | u8 *pcffrm = NULL; | 557 | u8 *pcffrm = NULL; |
560 | int len; | 558 | int len; |
561 | 559 | ||
@@ -584,7 +582,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi) | |||
584 | } | 582 | } |
585 | caif_assert(skb != NULL); | 583 | caif_assert(skb != NULL); |
586 | 584 | ||
587 | dst = skb_put_data(skb, pcffrm, len); | 585 | skb_put_data(skb, pcffrm, len); |
588 | 586 | ||
589 | skb->protocol = htons(ETH_P_CAIF); | 587 | skb->protocol = htons(ETH_P_CAIF); |
590 | skb_reset_mac_header(skb); | 588 | skb_reset_mac_header(skb); |
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index 5c57be2082ba..709838e4c062 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c | |||
@@ -171,7 +171,6 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data, | |||
171 | struct sk_buff *skb = NULL; | 171 | struct sk_buff *skb = NULL; |
172 | struct ser_device *ser; | 172 | struct ser_device *ser; |
173 | int ret; | 173 | int ret; |
174 | u8 *p; | ||
175 | 174 | ||
176 | ser = tty->disc_data; | 175 | ser = tty->disc_data; |
177 | 176 | ||
@@ -198,7 +197,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data, | |||
198 | skb = netdev_alloc_skb(ser->dev, count+1); | 197 | skb = netdev_alloc_skb(ser->dev, count+1); |
199 | if (skb == NULL) | 198 | if (skb == NULL) |
200 | return; | 199 | return; |
201 | p = skb_put_data(skb, data, count); | 200 | skb_put_data(skb, data, count); |
202 | 201 | ||
203 | skb->protocol = htons(ETH_P_CAIF); | 202 | skb->protocol = htons(ETH_P_CAIF); |
204 | skb_reset_mac_header(skb); | 203 | skb_reset_mac_header(skb); |
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 24a5f5ca2037..207cb8423de0 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c | |||
@@ -526,7 +526,6 @@ int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len) | |||
526 | struct sk_buff *skb = NULL; | 526 | struct sk_buff *skb = NULL; |
527 | int spad = 0; | 527 | int spad = 0; |
528 | int epad = 0; | 528 | int epad = 0; |
529 | u8 *dst = NULL; | ||
530 | int pkt_len = 0; | 529 | int pkt_len = 0; |
531 | 530 | ||
532 | /* | 531 | /* |
@@ -548,7 +547,7 @@ int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len) | |||
548 | skb = netdev_alloc_skb(cfspi->ndev, pkt_len + 1); | 547 | skb = netdev_alloc_skb(cfspi->ndev, pkt_len + 1); |
549 | caif_assert(skb != NULL); | 548 | caif_assert(skb != NULL); |
550 | 549 | ||
551 | dst = skb_put_data(skb, src, pkt_len); | 550 | skb_put_data(skb, src, pkt_len); |
552 | src += pkt_len; | 551 | src += pkt_len; |
553 | 552 | ||
554 | skb->protocol = htons(ETH_P_CAIF); | 553 | skb->protocol = htons(ETH_P_CAIF); |