Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 599eefff authored by Jouke Witteveen's avatar Jouke Witteveen Committed by Andy Shevchenko
Browse files

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: default avatarJouke Witteveen <j.witteveen@gmail.com>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent f25b6302

drivers/platform/x86/thinkpad_acpi.c

+13 −32
Original line number Diff line number Diff line
@@ -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;
@@ -8713,37 +8716,15 @@ static const struct attribute_group fan_attr_group = { 
#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;