networking: make skb_put & friends return void pointers

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

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index f87bfdfee4ff5adab798167929650f14f978931a..c1c4048ee37d4c979e35267901b6c52d9296a892 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -262,9 +262,9 @@ static int bcm_set_diag(struct hci_dev *hdev, bool enable)
        if (!skb)
                return -ENOMEM;
 
-       *skb_put(skb, 1) = BCM_LM_DIAG_PKT;
-       *skb_put(skb, 1) = 0xf0;
-       *skb_put(skb, 1) = enable;
+       *(u8 *)skb_put(skb, 1) = BCM_LM_DIAG_PKT;
+       *(u8 *)skb_put(skb, 1) = 0xf0;
+       *(u8 *)skb_put(skb, 1) = enable;
 
        skb_queue_tail(&bcm->txq, skb);
        hci_uart_tx_wakeup(hu);
@@ -762,8 +762,7 @@ static int bcm_acpi_probe(struct bcm_device *dev)
        if (id)
                gpio_mapping = (const struct acpi_gpio_mapping *) id->driver_data;
 
-       ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev),
-                                       gpio_mapping);
+       ret = devm_acpi_dev_add_driver_gpios(&pdev->dev, gpio_mapping);
        if (ret)
                return ret;
 
@@ -834,8 +833,6 @@ static int bcm_remove(struct platform_device *pdev)
        list_del(&dev->list);
        mutex_unlock(&bcm_device_lock);
 
-       acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
-
        dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
 
        return 0;