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

Commit dff3c294 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: 8250_dw: Drop wrong use of ACPI_PTR() 



[ Upstream commit ebabb77a2a115b6c5e68f7364b598310b5f61fb2 ]

ACPI_PTR() is more harmful than helpful. For example, in this case
if CONFIG_ACPI=n, the ID table left unused which is not what we want.

Instead of adding ifdeffery here and there, drop ACPI_PTR().

Fixes: 6a7320c4 ("serial: 8250_dw: Add ACPI 5.0 support")
Reported-by: default avatarDaniel Palmer <daniel@0x0f.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211005134516.23218-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 988471bf

drivers/tty/serial/8250/8250_dw.c

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static struct platform_driver dw8250_platform_driver = { 
		.name		= "dw-apb-uart",

		.pm		= &dw8250_pm_ops,

		.of_match_table	= dw8250_of_match,

		.acpi_match_table = ACPI_PTR(dw8250_acpi_match),

		.acpi_match_table = dw8250_acpi_match,

	},

	.probe			= dw8250_probe,

	.remove			= dw8250_remove,