networking: introduce and use skb_put_data()

[mirror_ubuntu-artful-kernel.git] / drivers / bluetooth / btusb.c

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index bfd5f4bdec806c2c093793ccd268045279cb3fe1..c7ea398e65c18e15f6aeda51b854d716eb2fe056 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -478,7 +478,7 @@ static int btusb_recv_intr(struct btusb_data *data, void *buffer, int count)
                }
 
                len = min_t(uint, hci_skb_expect(skb), count);
-               memcpy(skb_put(skb, len), buffer, len);
+               skb_put_data(skb, buffer, len);
 
                count -= len;
                buffer += len;
@@ -533,7 +533,7 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count)
                }
 
                len = min_t(uint, hci_skb_expect(skb), count);
-               memcpy(skb_put(skb, len), buffer, len);
+               skb_put_data(skb, buffer, len);
 
                count -= len;
                buffer += len;
@@ -590,7 +590,7 @@ static int btusb_recv_isoc(struct btusb_data *data, void *buffer, int count)
                }
 
                len = min_t(uint, hci_skb_expect(skb), count);
-               memcpy(skb_put(skb, len), buffer, len);
+               skb_put_data(skb, buffer, len);
 
                count -= len;
                buffer += len;
@@ -934,8 +934,8 @@ static void btusb_diag_complete(struct urb *urb)
 
                skb = bt_skb_alloc(urb->actual_length, GFP_ATOMIC);
                if (skb) {
-                       memcpy(skb_put(skb, urb->actual_length),
-                              urb->transfer_buffer, urb->actual_length);
+                       skb_put_data(skb, urb->transfer_buffer,
+                                    urb->actual_length);
                        hci_recv_diag(hdev, skb);
                }
        } else if (urb->status == -ENOENT) {
@@ -2395,7 +2395,7 @@ static int marvell_config_oob_wake(struct hci_dev *hdev)
                return -ENOMEM;
        }
 
-       memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));
+       skb_put_data(skb, cmd, sizeof(cmd));
        hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
 
        ret = btusb_send_frame(hdev, skb);