]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
serial: 8250_dw: Drop wrong use of ACPI_PTR()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 5 Oct 2021 13:45:16 +0000 (16:45 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 10:36:13 +0000 (11:36 +0100)
[ 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: 6a7320c4669f ("serial: 8250_dw: Add ACPI 5.0 support")
Reported-by: Daniel Palmer <daniel@0x0f.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211005134516.23218-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/tty/serial/8250/8250_dw.c

index 284e8d052fc3ced300ec73f5bf5945ea45d2aaf1..c73d0eddd9b8d6612a1df027ec25aa1c8891da3d 100644 (file)
@@ -769,7 +769,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,