networking: make skb_put & friends return void pointers

[mirror_ubuntu-artful-kernel.git] / drivers / nfc / pn533 / pn533.c

diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index 65bbaa5fcdda6c2a1dae0e415b4cc2c7b2029eac..68a3cd0287f65a07a9af7fad2869ebbd97ba40fd 100644 (file)
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -1032,29 +1032,26 @@ static struct sk_buff *pn533_alloc_poll_tg_frame(struct pn533 *dev)
                return NULL;
 
        /* DEP support only */
-       *skb_put(skb, 1) = PN533_INIT_TARGET_DEP;
+       *(u8 *)skb_put(skb, 1) = PN533_INIT_TARGET_DEP;
 
        /* MIFARE params */
-       memcpy(skb_put(skb, 6), mifare_params, 6);
+       skb_put_data(skb, mifare_params, 6);
 
        /* Felica params */
-       felica = skb_put(skb, 18);
-       memcpy(felica, felica_params, 18);
+       felica = skb_put_data(skb, felica_params, 18);
        get_random_bytes(felica + 2, 6);
 
        /* NFCID3 */
-       nfcid3 = skb_put(skb, 10);
-       memset(nfcid3, 0, 10);
+       nfcid3 = skb_put_zero(skb, 10);
        memcpy(nfcid3, felica, 8);
 
        /* General bytes */
-       *skb_put(skb, 1) = gbytes_len;
+       *(u8 *)skb_put(skb, 1) = gbytes_len;
 
-       gb = skb_put(skb, gbytes_len);
-       memcpy(gb, gbytes, gbytes_len);
+       gb = skb_put_data(skb, gbytes, gbytes_len);
 
        /* Len Tk */
-       *skb_put(skb, 1) = 0;
+       *(u8 *)skb_put(skb, 1) = 0;
 
        return skb;
 }
@@ -1283,8 +1280,8 @@ static void pn533_wq_rf(struct work_struct *work)
        if (!skb)
                return;
 
-       *skb_put(skb, 1) = PN533_CFGITEM_RF_FIELD;
-       *skb_put(skb, 1) = PN533_CFGITEM_RF_FIELD_AUTO_RFCA;
+       *(u8 *)skb_put(skb, 1) = PN533_CFGITEM_RF_FIELD;
+       *(u8 *)skb_put(skb, 1) = PN533_CFGITEM_RF_FIELD_AUTO_RFCA;
 
        rc = pn533_send_cmd_async(dev, PN533_CMD_RF_CONFIGURATION, skb,
                                  pn533_rf_complete, NULL);
@@ -1378,22 +1375,21 @@ static int pn533_poll_dep(struct nfc_dev *nfc_dev)
        if (!skb)
                return -ENOMEM;
 
-       *skb_put(skb, 1) = 0x01;  /* Active */
-       *skb_put(skb, 1) = 0x02;  /* 424 kbps */
+       *(u8 *)skb_put(skb, 1) = 0x01;  /* Active */
+       *(u8 *)skb_put(skb, 1) = 0x02;  /* 424 kbps */
 
        next = skb_put(skb, 1);  /* Next */
        *next = 0;
 
        /* Copy passive data */
-       memcpy(skb_put(skb, PASSIVE_DATA_LEN), passive_data, PASSIVE_DATA_LEN);
+       skb_put_data(skb, passive_data, PASSIVE_DATA_LEN);
        *next |= 1;
 
        /* Copy NFCID3 (which is NFCID2 from SENSF_RES) */
-       memcpy(skb_put(skb, NFC_NFCID3_MAXSIZE), nfcid3,
-              NFC_NFCID3_MAXSIZE);
+       skb_put_data(skb, nfcid3, NFC_NFCID3_MAXSIZE);
        *next |= 2;
 
-       memcpy(skb_put(skb, dev->gb_len), dev->gb, dev->gb_len);
+       skb_put_data(skb, dev->gb, dev->gb_len);
        *next |= 4; /* We have some Gi */
 
        rc = pn533_send_cmd_async(dev, PN533_CMD_IN_JUMP_FOR_DEP, skb,
@@ -1473,7 +1469,7 @@ static struct sk_buff *pn533_alloc_poll_in_frame(struct pn533 *dev,
        if (!skb)
                return NULL;
 
-       memcpy(skb_put(skb, mod->len), &mod->data, mod->len);
+       skb_put_data(skb, &mod->data, mod->len);
 
        return skb;
 }
@@ -1624,8 +1620,8 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev)
        if (!skb)
                return -ENOMEM;
 
-       *skb_put(skb, sizeof(u8)) = 1; /* TG */
-       *skb_put(skb, sizeof(u8)) = 0; /* Next */
+       *(u8 *)skb_put(skb, sizeof(u8)) = 1; /* TG */
+       *(u8 *)skb_put(skb, sizeof(u8)) = 0; /* Next */
 
        resp = pn533_send_cmd_sync(dev, PN533_CMD_IN_ATR, skb);
        if (IS_ERR(resp))
@@ -1741,7 +1737,7 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
        if (!skb)
                return;
 
-       *skb_put(skb, 1) = 1; /* TG*/
+       *(u8 *)skb_put(skb, 1) = 1; /* TG*/
 
        rc = pn533_send_cmd_async(dev, PN533_CMD_IN_RELEASE, skb,
                                  pn533_deactivate_target_complete, NULL);
@@ -1852,14 +1848,14 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
        if (!skb)
                return -ENOMEM;
 
-       *skb_put(skb, 1) = !comm_mode;  /* ActPass */
-       *skb_put(skb, 1) = 0x02;  /* 424 kbps */
+       *(u8 *)skb_put(skb, 1) = !comm_mode;  /* ActPass */
+       *(u8 *)skb_put(skb, 1) = 0x02;  /* 424 kbps */
 
        next = skb_put(skb, 1);  /* Next */
        *next = 0;
 
        /* Copy passive data */
-       memcpy(skb_put(skb, PASSIVE_DATA_LEN), passive_data, PASSIVE_DATA_LEN);
+       skb_put_data(skb, passive_data, PASSIVE_DATA_LEN);
        *next |= 1;
 
        /* Copy NFCID3 (which is NFCID2 from SENSF_RES) */
@@ -1867,12 +1863,11 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
                memcpy(skb_put(skb, NFC_NFCID3_MAXSIZE), target->nfcid2,
                       target->nfcid2_len);
        else
-               memcpy(skb_put(skb, NFC_NFCID3_MAXSIZE), nfcid3,
-                      NFC_NFCID3_MAXSIZE);
+               skb_put_data(skb, nfcid3, NFC_NFCID3_MAXSIZE);
        *next |= 2;
 
        if (gb != NULL && gb_len > 0) {
-               memcpy(skb_put(skb, gb_len), gb, gb_len);
+               skb_put_data(skb, gb, gb_len);
                *next |= 4; /* We have some Gi */
        } else {
                *next = 0;
@@ -2101,7 +2096,7 @@ static int pn533_fill_fragment_skbs(struct pn533 *dev, struct sk_buff *skb)
                                *skb_push(frag, sizeof(u8)) =  1; /* TG */
                }
 
-               memcpy(skb_put(frag, frag_size), skb->data, frag_size);
+               skb_put_data(frag, skb->data, frag_size);
 
                /* Reduce the size of incoming buffer */
                skb_pull(skb, frag_size);
@@ -2279,7 +2274,7 @@ static void pn533_wq_mi_recv(struct work_struct *work)
                        break;
                }
        default:
-               *skb_put(skb, sizeof(u8)) =  1; /*TG*/
+               *(u8 *)skb_put(skb, sizeof(u8)) =  1; /*TG*/
 
                rc = pn533_send_cmd_direct_async(dev,
                                                 PN533_CMD_IN_DATA_EXCHANGE,
@@ -2375,8 +2370,8 @@ static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata,
        if (!skb)
                return -ENOMEM;
 
-       *skb_put(skb, sizeof(cfgitem)) = cfgitem;
-       memcpy(skb_put(skb, cfgdata_len), cfgdata, cfgdata_len);
+       *(u8 *)skb_put(skb, sizeof(cfgitem)) = cfgitem;
+       skb_put_data(skb, cfgdata, cfgdata_len);
 
        resp = pn533_send_cmd_sync(dev, PN533_CMD_RF_CONFIGURATION, skb);
        if (IS_ERR(resp))
@@ -2420,7 +2415,7 @@ static int pn533_pasori_fw_reset(struct pn533 *dev)
        if (!skb)
                return -ENOMEM;
 
-       *skb_put(skb, sizeof(u8)) = 0x1;
+       *(u8 *)skb_put(skb, sizeof(u8)) = 0x1;
 
        resp = pn533_send_cmd_sync(dev, 0x18, skb);
        if (IS_ERR(resp))
@@ -2459,7 +2454,7 @@ static int pn532_sam_configuration(struct nfc_dev *nfc_dev)
        if (!skb)
                return -ENOMEM;
 
-       *skb_put(skb, 1) = 0x01;
+       *(u8 *)skb_put(skb, 1) = 0x01;
 
        resp = pn533_send_cmd_sync(dev, PN533_CMD_SAM_CONFIGURATION, skb);
        if (IS_ERR(resp))