Bluetooth: hci_bcm: Remove duplication in gpio-mappings declaration

We declare the same set of const acpi_gpio_params twice with different
names, besides the needless duplication this naming leads to a sortof
double indirection which also makes it harder to see how the mapping is
actually setup.

This commit renames the first set to have generic names, which better
describe the contents of the mapping and drops the second set.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index fe45b8869cc1910d586d83be8e502d962866dc75..e4371d0edbcf1f3bf55e6752575e794e6b66ef44 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -774,25 +774,21 @@ unlock:
 }
 #endif
 
-static const struct acpi_gpio_params int_last_device_wakeup_gpios = { 0, 0, false };
-static const struct acpi_gpio_params int_last_shutdown_gpios = { 1, 0, false };
-static const struct acpi_gpio_params int_last_host_wakeup_gpios = { 2, 0, false };
+static const struct acpi_gpio_params first_gpio = { 0, 0, false };
+static const struct acpi_gpio_params second_gpio = { 1, 0, false };
+static const struct acpi_gpio_params third_gpio = { 2, 0, false };
 
 static const struct acpi_gpio_mapping acpi_bcm_int_last_gpios[] = {
-       { "device-wakeup-gpios", &int_last_device_wakeup_gpios, 1 },
-       { "shutdown-gpios", &int_last_shutdown_gpios, 1 },
-       { "host-wakeup-gpios", &int_last_host_wakeup_gpios, 1 },
+       { "device-wakeup-gpios", &first_gpio, 1 },
+       { "shutdown-gpios", &second_gpio, 1 },
+       { "host-wakeup-gpios", &third_gpio, 1 },
        { },
 };
 
-static const struct acpi_gpio_params int_first_host_wakeup_gpios = { 0, 0, false };
-static const struct acpi_gpio_params int_first_device_wakeup_gpios = { 1, 0, false };
-static const struct acpi_gpio_params int_first_shutdown_gpios = { 2, 0, false };
-
 static const struct acpi_gpio_mapping acpi_bcm_int_first_gpios[] = {
-       { "device-wakeup-gpios", &int_first_device_wakeup_gpios, 1 },
-       { "shutdown-gpios", &int_first_shutdown_gpios, 1 },
-       { "host-wakeup-gpios", &int_first_host_wakeup_gpios, 1 },
+       { "host-wakeup-gpios", &first_gpio, 1 },
+       { "device-wakeup-gpios", &second_gpio, 1 },
+       { "shutdown-gpios", &third_gpio, 1 },
        { },
 };