platform/x86: thinkpad_acpi: Cleanup quirks macros

- Use generic quirks macros for fan quirks
The fan-specific quirks macros were duplicates of the generic ones.

- Remove useless #undef lines
The referenced macros are not defined anywhere.

Signed-off-by: Jouke Witteveen <j.witteveen@gmail.com>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

1 files changed, 13 insertions, 32 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index a86cf47292e9..f5773cdfdebc 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -478,6 +478,12 @@ do {									\
           .ec = TPACPI_MATCH_ANY,               \
           .quirks = (__quirk) }
 
+#define TPACPI_QEC_IBM(__id1, __id2, __quirk)   \
+        { .vendor = PCI_VENDOR_ID_IBM,          \
+          .bios = TPACPI_MATCH_ANY,             \
+          .ec = TPID(__id1, __id2),             \
+          .quirks = (__quirk) }
+
 #define TPACPI_QEC_LNV(__id1, __id2, __quirk)   \
         { .vendor = PCI_VENDOR_ID_LENOVO,       \
           .bios = TPACPI_MATCH_ANY,             \
@@ -5973,9 +5979,6 @@ static const struct tpacpi_quirk led_useful_qtable[] __initconst = {
         },
 };
 
-#undef TPACPI_LEDQ_IBM
-#undef TPACPI_LEDQ_LNV
-
 static enum led_access_mode __init led_init_detect_mode(void)
 {
         acpi_status status;
@@ -8710,40 +8713,18 @@ static const struct attribute_group fan_attr_group = {
         .attrs = fan_attributes,
 };
 
-#define TPACPI_FAN_Q1   0x0001          /* Unitialized HFSP */
+#define TPACPI_FAN_Q1   0x0001          /* Unitialized HFSP */
 #define TPACPI_FAN_2FAN 0x0002          /* EC 0x31 bit 0 selects fan2 */
 
-#define TPACPI_FAN_QI(__id1, __id2, __quirks)   \
-        { .vendor = PCI_VENDOR_ID_IBM,          \
-          .bios = TPACPI_MATCH_ANY,             \
-          .ec = TPID(__id1, __id2),             \
-          .quirks = __quirks }
-
-#define TPACPI_FAN_QL(__id1, __id2, __quirks)   \
-        { .vendor = PCI_VENDOR_ID_LENOVO,       \
-          .bios = TPACPI_MATCH_ANY,             \
-          .ec = TPID(__id1, __id2),             \
-          .quirks = __quirks }
-
-#define TPACPI_FAN_QB(__id1, __id2, __quirks)   \
-        { .vendor = PCI_VENDOR_ID_LENOVO,       \
-          .bios = TPID(__id1, __id2),           \
-          .ec = TPACPI_MATCH_ANY,               \
-          .quirks = __quirks }
-
 static const struct tpacpi_quirk fan_quirk_table[] __initconst = {
-        TPACPI_FAN_QI('1', 'Y', TPACPI_FAN_Q1),
-        TPACPI_FAN_QI('7', '8', TPACPI_FAN_Q1),
-        TPACPI_FAN_QI('7', '6', TPACPI_FAN_Q1),
-        TPACPI_FAN_QI('7', '0', TPACPI_FAN_Q1),
-        TPACPI_FAN_QL('7', 'M', TPACPI_FAN_2FAN),
-        TPACPI_FAN_QB('N', '1', TPACPI_FAN_2FAN),
+        TPACPI_QEC_IBM('1', 'Y', TPACPI_FAN_Q1),
+        TPACPI_QEC_IBM('7', '8', TPACPI_FAN_Q1),
+        TPACPI_QEC_IBM('7', '6', TPACPI_FAN_Q1),
+        TPACPI_QEC_IBM('7', '0', TPACPI_FAN_Q1),
+        TPACPI_QEC_LNV('7', 'M', TPACPI_FAN_2FAN),
+        TPACPI_Q_LNV('N', '1', TPACPI_FAN_2FAN),
 };
 
-#undef TPACPI_FAN_QL
-#undef TPACPI_FAN_QI
-#undef TPACPI_FAN_QB
-
 static int __init fan_init(struct ibm_init_struct *iibm)
 {
         int rc;