Bluetooth: hci_bcm: move all Broadcom ACPI IDs to BCM HCI driver

The IDs should all be for Broadcom BCM43241 module, and
hci_bcm is now the proper driver for them. This removes one
of two different ways of handling PM with the module.

Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 5c7c696c58381f7810f4cbcd9c2cee945cf651bf..abf13a7546898f4a0d7e049d57a17b3fb9a482e3 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -814,7 +814,11 @@ static const struct hci_uart_proto bcm_proto = {
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id bcm_acpi_match[] = {
+       { "BCM2E1A", 0 },
        { "BCM2E39", 0 },
+       { "BCM2E3D", 0 },
+       { "BCM2E40", 0 },
+       { "BCM2E64", 0 },
        { "BCM2E65", 0 },
        { "BCM2E67", 0 },
        { },

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 93127220cb54ac7ffdc78890a3753031652b8139..4b1e3f35f06cf39ecb9bb3f6a88d802a67a37bc3 100644 (file)
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -163,10 +163,6 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id rfkill_acpi_match[] = {
-       { "BCM2E1A", RFKILL_TYPE_BLUETOOTH },
-       { "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
-       { "BCM2E40", RFKILL_TYPE_BLUETOOTH },
-       { "BCM2E64", RFKILL_TYPE_BLUETOOTH },
        { "BCM4752", RFKILL_TYPE_GPS },
        { "LNV4752", RFKILL_TYPE_GPS },
        { },