networking: make skb_pull & friends return void pointers

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / drivers / bluetooth / hci_nokia.c

diff --git a/drivers/bluetooth/hci_nokia.c b/drivers/bluetooth/hci_nokia.c
index a7d687d8d456915cf1acaa8dd94345d12c0bccee..072a77a61e67d9e7ac817006d9b19c1dff8bbb49 100644 (file)
--- a/drivers/bluetooth/hci_nokia.c
+++ b/drivers/bluetooth/hci_nokia.c
@@ -246,9 +246,9 @@ static int nokia_send_alive_packet(struct hci_uart *hu)
        hci_skb_pkt_type(skb) = HCI_NOKIA_ALIVE_PKT;
        memset(skb->data, 0x00, len);
 
-       hdr = (struct hci_nokia_alive_hdr *)skb_put(skb, sizeof(*hdr));
+       hdr = skb_put(skb, sizeof(*hdr));
        hdr->dlen = sizeof(*pkt);
-       pkt = (struct hci_nokia_alive_pkt *)skb_put(skb, sizeof(*pkt));
+       pkt = skb_put(skb, sizeof(*pkt));
        pkt->mid = NOKIA_ALIVE_REQ;
 
        nokia_enqueue(hu, skb);
@@ -285,10 +285,10 @@ static int nokia_send_negotiation(struct hci_uart *hu)
 
        hci_skb_pkt_type(skb) = HCI_NOKIA_NEG_PKT;
 
-       neg_hdr = (struct hci_nokia_neg_hdr *)skb_put(skb, sizeof(*neg_hdr));
+       neg_hdr = skb_put(skb, sizeof(*neg_hdr));
        neg_hdr->dlen = sizeof(*neg_cmd);
 
-       neg_cmd = (struct hci_nokia_neg_cmd *)skb_put(skb, sizeof(*neg_cmd));
+       neg_cmd = skb_put(skb, sizeof(*neg_cmd));
        neg_cmd->ack = NOKIA_NEG_REQ;
        neg_cmd->baud = cpu_to_le16(baud);
        neg_cmd->unused1 = 0x0000;
@@ -532,7 +532,7 @@ static int nokia_enqueue(struct hci_uart *hu, struct sk_buff *skb)
                err = skb_pad(skb, 1);
                if (err)
                        return err;
-               *skb_put(skb, 1) = 0x00;
+               *(u8 *)skb_put(skb, 1) = 0x00;
        }
 
        skb_queue_tail(&btdev->txq, skb);
@@ -557,7 +557,7 @@ static int nokia_recv_negotiation_packet(struct hci_dev *hdev,
                goto finish_neg;
        }
 
-       evt = (struct hci_nokia_neg_evt *)skb_pull(skb, sizeof(*hdr));
+       evt = skb_pull(skb, sizeof(*hdr));
 
        if (evt->ack != NOKIA_NEG_ACK) {
                dev_err(dev, "Negotiation received: wrong reply");
@@ -595,7 +595,7 @@ static int nokia_recv_alive_packet(struct hci_dev *hdev, struct sk_buff *skb)
                goto finish_alive;
        }
 
-       pkt = (struct hci_nokia_alive_pkt *)skb_pull(skb, sizeof(*hdr));
+       pkt = skb_pull(skb, sizeof(*hdr));
 
        if (pkt->mid != NOKIA_ALIVE_RESP) {
                dev_err(dev, "Alive received: invalid response: 0x%02x!",