summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-08-12 02:22:11 -0400
committerMarcel Holtmann <marcel@holtmann.org>2019-09-05 11:27:21 -0400
commitff7c8380c9d36252a6b977cf9c7f8b75abfb8719 (patch)
tree56d9fbffab1def86543084cc869b8ec3166f82cd
parent9c81f2b7e7835a2a1fb1c4e96e36f710fc4b0728 (diff)
Bluetooth: hci_bcm: Fix -Wunused-const-variable warnings
If CONFIG_ACPI is not set, gcc warn this: drivers/bluetooth/hci_bcm.c:831:39: warning: acpi_bcm_int_last_gpios defined but not used [-Wunused-const-variable=] drivers/bluetooth/hci_bcm.c:838:39: warning: acpi_bcm_int_first_gpios defined but not used [-Wunused-const-variable=] move them to #ifdef CONFIG_ACPI block. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/bluetooth/hci_bcm.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index ae2624fce913..4d9de20bab7b 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -824,6 +824,21 @@ unlock:
824} 824}
825#endif 825#endif
826 826
827/* Some firmware reports an IRQ which does not work (wrong pin in fw table?) */
828static const struct dmi_system_id bcm_broken_irq_dmi_table[] = {
829 {
830 .ident = "Meegopad T08",
831 .matches = {
832 DMI_EXACT_MATCH(DMI_BOARD_VENDOR,
833 "To be filled by OEM."),
834 DMI_EXACT_MATCH(DMI_BOARD_NAME, "T3 MRD"),
835 DMI_EXACT_MATCH(DMI_BOARD_VERSION, "V1.1"),
836 },
837 },
838 { }
839};
840
841#ifdef CONFIG_ACPI
827static const struct acpi_gpio_params first_gpio = { 0, 0, false }; 842static const struct acpi_gpio_params first_gpio = { 0, 0, false };
828static const struct acpi_gpio_params second_gpio = { 1, 0, false }; 843static const struct acpi_gpio_params second_gpio = { 1, 0, false };
829static const struct acpi_gpio_params third_gpio = { 2, 0, false }; 844static const struct acpi_gpio_params third_gpio = { 2, 0, false };
@@ -842,21 +857,6 @@ static const struct acpi_gpio_mapping acpi_bcm_int_first_gpios[] = {
842 { }, 857 { },
843}; 858};
844 859
845/* Some firmware reports an IRQ which does not work (wrong pin in fw table?) */
846static const struct dmi_system_id bcm_broken_irq_dmi_table[] = {
847 {
848 .ident = "Meegopad T08",
849 .matches = {
850 DMI_EXACT_MATCH(DMI_BOARD_VENDOR,
851 "To be filled by OEM."),
852 DMI_EXACT_MATCH(DMI_BOARD_NAME, "T3 MRD"),
853 DMI_EXACT_MATCH(DMI_BOARD_VERSION, "V1.1"),
854 },
855 },
856 { }
857};
858
859#ifdef CONFIG_ACPI
860static int bcm_resource(struct acpi_resource *ares, void *data) 860static int bcm_resource(struct acpi_resource *ares, void *data)
861{ 861{
862 struct bcm_device *dev = data; 862 struct bcm_device *dev = data;