networking: convert many more places to skb_put_zero()

There were many places that my previous spatch didn't find,
as pointed out by yuan linyu in various patches.

The following spatch found many more and also removes the
now unnecessary casts:

    @@
    identifier p, p2;
    expression len;
    expression skb;
    type t, t2;
    @@
    (
    -p = skb_put(skb, len);
    +p = skb_put_zero(skb, len);
    |
    -p = (t)skb_put(skb, len);
    +p = skb_put_zero(skb, len);
    )
    ... when != p
    (
    p2 = (t2)p;
    -memset(p2, 0, len);
    |
    -memset(p, 0, len);
    )

    @@
    type t, t2;
    identifier p, p2;
    expression skb;
    @@
    t *p;
    ...
    (
    -p = skb_put(skb, sizeof(t));
    +p = skb_put_zero(skb, sizeof(t));
    |
    -p = (t *)skb_put(skb, sizeof(t));
    +p = skb_put_zero(skb, sizeof(t));
    )
    ... when != p
    (
    p2 = (t2)p;
    -memset(p2, 0, sizeof(*p));
    |
    -memset(p, 0, sizeof(*p));
    )

    @@
    expression skb, len;
    @@
    -memset(skb_put(skb, len), 0, len);
    +skb_put_zero(skb, len);

Apply it to the tree (with one manual fixup to keep the
comment in vxlan.c, which spatch removed.)

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

21 files changed, 35 insertions, 68 deletions

diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 558d6a03375d..97f7f9544e70 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -142,8 +142,7 @@ static int cxio_hal_clear_qp_ctx(struct cxio_rdev *rdev_p, u32 qpid)
                 pr_debug("%s alloc_skb failed\n", __func__);
                 return -ENOMEM;
         }
-        wqe = (struct t3_modify_qp_wr *) skb_put(skb, sizeof(*wqe));
-        memset(wqe, 0, sizeof(*wqe));
+        wqe = skb_put_zero(skb, sizeof(*wqe));
         build_fw_riwrh((struct fw_riwrh *) wqe, T3_WR_QP_MOD,
                        T3_COMPLETION_FLAG | T3_NOTIFY_FLAG, 0, qpid, 7,
                        T3_SOPEOP);
@@ -561,8 +560,7 @@ static int cxio_hal_init_ctrl_qp(struct cxio_rdev *rdev_p)
         ctx1 |= ((u64) (V_EC_BASE_HI((u32) base_addr & 0xf) | V_EC_RESPQ(0) |
                         V_EC_TYPE(0) | V_EC_GEN(1) |
                         V_EC_UP_TOKEN(T3_CTL_QP_TID) | F_EC_VALID)) << 32;
-        wqe = (struct t3_modify_qp_wr *) skb_put(skb, sizeof(*wqe));
-        memset(wqe, 0, sizeof(*wqe));
+        wqe = skb_put_zero(skb, sizeof(*wqe));
         build_fw_riwrh((struct fw_riwrh *) wqe, T3_WR_QP_MOD, 0, 0,
                        T3_CTL_QP_TID, 7, T3_SOPEOP);
         wqe->flags = cpu_to_be32(MODQP_WRITE_EC);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index b61630eba912..f4c23a74f18c 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -417,8 +417,7 @@ static int send_abort(struct iwch_ep *ep, struct sk_buff *skb, gfp_t gfp)
         }
         skb->priority = CPL_PRIORITY_DATA;
         set_arp_failure_handler(skb, abort_arp_failure);
-        req = (struct cpl_abort_req *) skb_put(skb, sizeof(*req));
-        memset(req, 0, sizeof(*req));
+        req = skb_put_zero(skb, sizeof(*req));
         req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_REQ));
         req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid));
         OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ABORT_REQ, ep->hwtid));
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index ba6d5d281b03..7f633da0185d 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -670,8 +670,7 @@ int iwch_post_zb_read(struct iwch_ep *ep)
                 pr_err("%s cannot send zb_read!!\n", __func__);
                 return -ENOMEM;
         }
-        wqe = (union t3_wr *)skb_put(skb, sizeof(struct t3_rdma_read_wr));
-        memset(wqe, 0, sizeof(struct t3_rdma_read_wr));
+        wqe = skb_put_zero(skb, sizeof(struct t3_rdma_read_wr));
         wqe->read.rdmaop = T3_READ_REQ;
         wqe->read.reserved[0] = 0;
         wqe->read.reserved[1] = 0;
@@ -702,8 +701,7 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg)
                 pr_err("%s cannot send TERMINATE!\n", __func__);
                 return -ENOMEM;
         }
-        wqe = (union t3_wr *)skb_put(skb, 40);
-        memset(wqe, 0, 40);
+        wqe = skb_put_zero(skb, 40);
         wqe->send.rdmaop = T3_TERMINATE;
 
         /* immediate data length */
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 2f1136bf7b1f..7c32a7c7977d 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -927,8 +927,7 @@ static int send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb,
         }
         set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
 
-        req = (struct fw_ofld_tx_data_wr *)skb_put(skb, wrlen);
-        memset(req, 0, wrlen);
+        req = skb_put_zero(skb, wrlen);
         req->op_to_immdlen = cpu_to_be32(
                 FW_WR_OP_V(FW_OFLD_TX_DATA_WR) |
                 FW_WR_COMPL_F |
@@ -1034,8 +1033,7 @@ static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen)
         }
         set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
 
-        req = (struct fw_ofld_tx_data_wr *)skb_put(skb, wrlen);
-        memset(req, 0, wrlen);
+        req = skb_put_zero(skb, wrlen);
         req->op_to_immdlen = cpu_to_be32(
                 FW_WR_OP_V(FW_OFLD_TX_DATA_WR) |
                 FW_WR_COMPL_F |
@@ -1115,8 +1113,7 @@ static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen)
         }
         set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
 
-        req = (struct fw_ofld_tx_data_wr *) skb_put(skb, wrlen);
-        memset(req, 0, wrlen);
+        req = skb_put_zero(skb, wrlen);
         req->op_to_immdlen = cpu_to_be32(
                 FW_WR_OP_V(FW_OFLD_TX_DATA_WR) |
                 FW_WR_COMPL_F |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
index 5225f2226a67..601abf240d63 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
@@ -172,7 +172,7 @@ static struct sk_buff *mlx5e_test_get_udp_skb(struct mlx5e_priv *priv)
         mlxh->magic = cpu_to_be64(MLX5E_TEST_MAGIC);
         strlcpy(mlxh->text, mlx5e_test_text, sizeof(mlxh->text));
         datalen -= sizeof(*mlxh);
-        memset(skb_put(skb, datalen), 0, datalen);
+        skb_put_zero(skb, datalen);
 
         skb->csum = 0;
         skb->ip_summed = CHECKSUM_PARTIAL;
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index b5cec1824a78..7f02954772c6 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1017,7 +1017,7 @@ static void cdc_ncm_align_tail(struct sk_buff *skb, size_t modulus, size_t remai
         if (skb->len + align > max)
                 align = max - skb->len;
         if (align && skb_tailroom(skb) >= align)
-                memset(skb_put(skb, align), 0, align);
+                skb_put_zero(skb, align);
 }
 
 /* return a pointer to a valid struct usb_cdc_ncm_ndp16 of type sign, possibly
@@ -1247,7 +1247,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
         if (!(dev->driver_info->flags & FLAG_SEND_ZLP) &&
             skb_out->len > ctx->min_tx_pkt) {
                 padding_count = ctx->tx_max - skb_out->len;
-                memset(skb_put(skb_out, padding_count), 0, padding_count);
+                skb_put_zero(skb_out, padding_count);
         } else if (skb_out->len < ctx->tx_max &&
                    (skb_out->len % dev->maxpacket) == 0) {
                 *skb_put(skb_out, 1) = 0;       /* force short packet */
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index 8aefb282c862..ce0b0b4e3a57 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -217,7 +217,7 @@ done:
         remainder = skb->len % KALMIA_ALIGN_SIZE;
         if (remainder > 0) {
                 padlen = KALMIA_ALIGN_SIZE - remainder;
-                memset(skb_put(skb, padlen), 0, padlen);
+                skb_put_zero(skb, padlen);
         }
 
         netdev_dbg(dev->net,
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 25b70cad055c..4e1d427d340c 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1584,10 +1584,8 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request,
         skb_pull(reply, sizeof(struct ipv6hdr));
         skb_reset_transport_header(reply);
 
-        na = (struct nd_msg *)skb_put(reply, sizeof(*na) + na_olen);
-
         /* Neighbor Advertisement */
-        memset(na, 0, sizeof(*na)+na_olen);
+        na = skb_put_zero(reply, sizeof(*na) + na_olen);
         na->icmph.icmp6_type = NDISC_NEIGHBOUR_ADVERTISEMENT;
         na->icmph.icmp6_router = isrouter;
         na->icmph.icmp6_override = 1;
diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index b84539d89f1a..373b1e9457fd 100644
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -1526,8 +1526,7 @@ void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *avp,
         hdr[1] = sizeof(noa_ie_hdr) + noa_len - 2;
         hdr[7] = noa_len;
 
-        noa = (void *) skb_put(skb, noa_len);
-        memset(noa, 0, noa_len);
+        noa = skb_put_zero(skb, noa_len);
 
         noa->index = avp->noa_index;
         noa->oppps_ctwindow = ath9k_get_ctwin(sc, avp);
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c
index c995ace153ee..89b5987303a4 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_ap.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_ap.c
@@ -998,12 +998,10 @@ static void prism2_send_mgmt(struct net_device *dev,
 
         fc = type_subtype;
         hdrlen = hostap_80211_get_hdrlen(cpu_to_le16(type_subtype));
-        hdr = (struct ieee80211_hdr *) skb_put(skb, hdrlen);
+        hdr = skb_put_zero(skb, hdrlen);
         if (body)
                 memcpy(skb_put(skb, body_len), body, body_len);
 
-        memset(hdr, 0, hdrlen);
-
         /* FIX: ctrl::ack sending used special HFA384X_TX_CTRL_802_11
          * tx_control instead of using local->tx_control */
 
@@ -1325,8 +1323,7 @@ static char * ap_auth_make_challenge(struct ap_data *ap)
         }
 
         skb_reserve(skb, ap->crypt->extra_mpdu_prefix_len);
-        memset(skb_put(skb, WLAN_AUTH_CHALLENGE_LEN), 0,
-               WLAN_AUTH_CHALLENGE_LEN);
+        skb_put_zero(skb, WLAN_AUTH_CHALLENGE_LEN);
         if (ap->crypt->encrypt_mpdu(skb, 0, ap->crypt_priv)) {
                 dev_kfree_skb(skb);
                 kfree(tmpbuf);
diff --git a/drivers/net/wireless/intersil/hostap/hostap_main.c b/drivers/net/wireless/intersil/hostap/hostap_main.c
index 1372b20f931e..400f9b5d620e 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_main.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_main.c
@@ -1039,9 +1039,7 @@ int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,
         if (skb == NULL)
                 return -ENOMEM;
 
-        mgmt = (struct hostap_ieee80211_mgmt *)
-                skb_put(skb, IEEE80211_MGMT_HDR_LEN);
-        memset(mgmt, 0, IEEE80211_MGMT_HDR_LEN);
+        mgmt = skb_put_zero(skb, IEEE80211_MGMT_HDR_LEN);
         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype);
         memcpy(mgmt->da, dst, ETH_ALEN);
         memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c
index 5e1c91a80c58..60f9b678ef74 100644
--- a/drivers/net/wireless/intersil/p54/txrx.c
+++ b/drivers/net/wireless/intersil/p54/txrx.c
@@ -910,8 +910,7 @@ void p54_tx_80211(struct ieee80211_hw *dev,
                 }
                 /* reserve some space for ICV */
                 len += info->control.hw_key->icv_len;
-                memset(skb_put(skb, info->control.hw_key->icv_len), 0,
-                       info->control.hw_key->icv_len);
+                skb_put_zero(skb, info->control.hw_key->icv_len);
         } else {
                 txhdr->key_type = 0;
                 txhdr->key_len = 0;
diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 40c3fe5ab8ca..8dad52886034 100644
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -622,8 +622,7 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no,
                 return -1;
         }
 
-        memset(skb_put(cmd_node->cmd_skb, sizeof(struct host_cmd_ds_command)),
-               0, sizeof(struct host_cmd_ds_command));
+        skb_put_zero(cmd_node->cmd_skb, sizeof(struct host_cmd_ds_command));
 
         cmd_ptr = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);
         cmd_ptr->command = cpu_to_le16(cmd_no);
diff --git a/drivers/net/wireless/marvell/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c
index b7d124dbef0c..c76b7315af55 100644
--- a/drivers/net/wireless/marvell/mwifiex/tdls.c
+++ b/drivers/net/wireless/marvell/mwifiex/tdls.c
@@ -388,8 +388,7 @@ mwifiex_tdls_add_wmm_param_ie(struct mwifiex_private *priv, struct sk_buff *skb)
         u8 ac_be[] = {0x03, 0xa4, 0x00, 0x00};
         u8 ac_bk[] = {0x27, 0xa4, 0x00, 0x00};
 
-        wmm = (void *)skb_put(skb, sizeof(*wmm));
-        memset(wmm, 0, sizeof(*wmm));
+        wmm = skb_put_zero(skb, sizeof(*wmm));
 
         wmm->element_id = WLAN_EID_VENDOR_SPECIFIC;
         wmm->len = sizeof(*wmm) - 2;
diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c
index f0a0cfa7d8a1..37c3bececa1f 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c
@@ -135,7 +135,7 @@ static struct sk_buff *qtnf_cmd_alloc_new_cmdskb(u8 macid, u8 vifid, u16 cmd_no,
                 return NULL;
         }
 
-        memset(skb_put(cmd_skb, cmd_size), 0, cmd_size);
+        skb_put_zero(cmd_skb, cmd_size);
 
         cmd = (struct qlink_cmd *)cmd_skb->data;
         cmd->mhdr.len = cpu_to_le16(cmd_skb->len);
@@ -238,9 +238,7 @@ int qtnf_cmd_send_config_ap(struct qtnf_vif *vif)
                                  bss_cfg->bcn_period);
         qtnf_cmd_skb_put_tlv_u8(cmd_skb, QTN_TLV_ID_DTIM, bss_cfg->dtim);
 
-        qchan = (struct qlink_tlv_channel *)skb_put(cmd_skb, sizeof(*qchan));
-
-        memset(qchan, 0, sizeof(*qchan));
+        qchan = skb_put_zero(cmd_skb, sizeof(*qchan));
         qchan->hdr.type = cpu_to_le16(QTN_TLV_ID_CHANNEL);
         qchan->hdr.len = cpu_to_le16(sizeof(*qchan) -
                         sizeof(struct qlink_tlv_hdr));
@@ -1794,9 +1792,7 @@ int qtnf_cmd_send_scan(struct qtnf_wmac *mac)
                         pr_debug("MAC%u: scan chan=%d, freq=%d, flags=%#x\n",
                                  mac->macid, sc->hw_value, sc->center_freq,
                                  sc->flags);
-                        qchan = (struct qlink_tlv_channel *)
-                                        skb_put(cmd_skb, sizeof(*qchan));
-                        memset(qchan, 0, sizeof(*qchan));
+                        qchan = skb_put_zero(cmd_skb, sizeof(*qchan));
                         flags = 0;
 
                         qchan->hdr.type = cpu_to_le16(QTN_TLV_ID_CHANNEL);
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index bdc379178e87..710e5b447cff 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -1875,8 +1875,7 @@ static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
                 return NULL;
 
         skb_reserve(skb, hw->extra_tx_headroom);
-        action_frame = (void *)skb_put(skb, 27);
-        memset(action_frame, 0, 27);
+        action_frame = skb_put_zero(skb, 27);
         memcpy(action_frame->da, da, ETH_ALEN);
         memcpy(action_frame->sa, rtlefuse->dev_addr, ETH_ALEN);
         memcpy(action_frame->bssid, bssid, ETH_ALEN);
@@ -2005,8 +2004,7 @@ struct sk_buff *rtl_make_del_ba(struct ieee80211_hw *hw,
                 return NULL;
 
         skb_reserve(skb, hw->extra_tx_headroom);
-        action_frame = (void *)skb_put(skb, 34);
-        memset(action_frame, 0, 34);
+        action_frame = skb_put_zero(skb, 34);
         memcpy(action_frame->sa, sa, ETH_ALEN);
         memcpy(action_frame->da, rtlefuse->dev_addr, ETH_ALEN);
         memcpy(action_frame->bssid, bssid, ETH_ALEN);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 7f4da727bb7b..4a39fb13c478 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -1233,8 +1233,7 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
         skb_reserve(skb, sizeof(*hdr) + WL1271_EXTRA_SPACE_MAX);
 
-        tmpl = (struct wl12xx_arp_rsp_template *)skb_put(skb, sizeof(*tmpl));
-        memset(tmpl, 0, sizeof(*tmpl));
+        tmpl = skb_put_zero(skb, sizeof(*tmpl));
 
         /* llc layer */
         memcpy(tmpl->llc_hdr, rfc1042_header, sizeof(rfc1042_header));
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 382ec15ec1af..60aaa850fbd1 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1308,13 +1308,12 @@ static struct sk_buff *wl12xx_alloc_dummy_packet(struct wl1271 *wl)
 
         skb_reserve(skb, sizeof(struct wl1271_tx_hw_descr));
 
-        hdr = (struct ieee80211_hdr_3addr *) skb_put(skb, sizeof(*hdr));
-        memset(hdr, 0, sizeof(*hdr));
+        hdr = skb_put_zero(skb, sizeof(*hdr));
         hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |
                                          IEEE80211_STYPE_NULLFUNC |
                                          IEEE80211_FCTL_TODS);
 
-        memset(skb_put(skb, dummy_packet_size), 0, dummy_packet_size);
+        skb_put_zero(skb, dummy_packet_size);
 
         /* Dummy packets require the TID to be management */
         skb->priority = WL1271_TID_MGMT;
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index 656463ff9ccb..e17bdb3adf9e 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -660,8 +660,7 @@ static int fcoe_ctlr_encaps(struct fcoe_ctlr *fip, struct fc_lport *lport,
 
         if (op != ELS_LS_RJT) {
                 dlen += sizeof(*mac);
-                mac = (struct fip_mac_desc *)skb_put(skb, sizeof(*mac));
-                memset(mac, 0, sizeof(*mac));
+                mac = skb_put_zero(skb, sizeof(*mac));
                 mac->fd_desc.fip_dtype = FIP_DT_MAC;
                 mac->fd_desc.fip_dlen = sizeof(*mac) / FIP_BPW;
                 if (dtype != FIP_DT_FLOGI && dtype != FIP_DT_FDISC) {
diff --git a/drivers/scsi/libfc/fc_libfc.c b/drivers/scsi/libfc/fc_libfc.c
index d623d084b7ec..dbadbc81b24b 100644
--- a/drivers/scsi/libfc/fc_libfc.c
+++ b/drivers/scsi/libfc/fc_libfc.c
@@ -178,7 +178,7 @@ void fc_fill_hdr(struct fc_frame *fp, const struct fc_frame *in_fp,
                 fill = -fr_len(fp) & 3;
                 if (fill) {
                         /* TODO, this may be a problem with fragmented skb */
-                        memset(skb_put(fp_skb(fp), fill), 0, fill);
+                        skb_put_zero(fp_skb(fp), fill);
                         f_ctl |= fill;
                 }
                 fr_eof(fp) = FC_EOF_T;
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 864819ff9a7d..2882c6d3ae66 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1004,8 +1004,7 @@ static struct sk_buff *package_for_tx(struct f_ncm *ncm)
         }
 
         /* Insert NDP alignment. */
-        ntb_iter = (void *) skb_put(skb2, ndp_pad);
-        memset(ntb_iter, 0, ndp_pad);
+        ntb_iter = skb_put_zero(skb2, ndp_pad);
 
         /* Copy NTB across. */
         ntb_iter = (void *) skb_put(skb2, ncm->skb_tx_ndp->len);
@@ -1014,8 +1013,7 @@ static struct sk_buff *package_for_tx(struct f_ncm *ncm)
         ncm->skb_tx_ndp = NULL;
 
         /* Insert zero'd datagram. */
-        ntb_iter = (void *) skb_put(skb2, dgram_idx_len);
-        memset(ntb_iter, 0, dgram_idx_len);
+        ntb_iter = skb_put_zero(skb2, dgram_idx_len);
 
         return skb2;
 }
@@ -1080,8 +1078,7 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
                                 goto err;
 
                         ncm->skb_tx_data->dev = ncm->netdev;
-                        ntb_data = (void *) skb_put(ncm->skb_tx_data, ncb_len);
-                        memset(ntb_data, 0, ncb_len);
+                        ntb_data = skb_put_zero(ncm->skb_tx_data, ncb_len);
                         /* dwSignature */
                         put_unaligned_le32(opts->nth_sign, ntb_data);
                         ntb_data += 2;
@@ -1118,8 +1115,7 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
                               HRTIMER_MODE_REL);
 
                 /* Add the datagram position entries */
-                ntb_ndp = (void *) skb_put(ncm->skb_tx_ndp, dgram_idx_len);
-                memset(ntb_ndp, 0, dgram_idx_len);
+                ntb_ndp = skb_put_zero(ncm->skb_tx_ndp, dgram_idx_len);
 
                 ncb_len = ncm->skb_tx_data->len;
                 dgram_pad = ALIGN(ncb_len, div) + rem - ncb_len;
@@ -1132,8 +1128,7 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
                 ncm->ndp_dgram_count++;
 
                 /* Add the new data to the skb */
-                ntb_data = (void *) skb_put(ncm->skb_tx_data, dgram_pad);
-                memset(ntb_data, 0, dgram_pad);
+                ntb_data = skb_put_zero(ncm->skb_tx_data, dgram_pad);
                 ntb_data = (void *) skb_put(ncm->skb_tx_data, skb->len);
                 memcpy(ntb_data, skb->data, skb->len);
                 dev_consume_skb_any(skb);