tty: serial: pl011: remove incorrect of_match_ptr annotation

Building with W=1 shows a warning about sbsa_uart_of_match being unused when
CONFIG_OF is disabled:

    drivers/tty/serial/amba-pl011.c:2945:34: error: unused variable 'sbsa_uart_of_match' [-Werror,-Wunused-const-variable]

The driver is not actually used on any machines that are built
with CONFIG_OF disabled, so using of_match_ptr() won't save any
actual memory, and it can be best removed.

The corresponding ACPI_PTR() annotation does save a few bytes on
32-bit arm since CONFIG_ACPI is not available, but for consistency
it seems better to remove both along with the __maybe_unused
annotation on the ACPI table.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250225163556.4169086-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 047fb9f515399ec8889b6c05cd70e7bcdafb20de..dc092204b4722f8be4334224f6602969581e9b49 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -3051,7 +3051,7 @@ static const struct of_device_id sbsa_uart_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, sbsa_uart_of_match);
 
-static const struct acpi_device_id __maybe_unused sbsa_uart_acpi_match[] = {
+static const struct acpi_device_id sbsa_uart_acpi_match[] = {
        { "ARMH0011", 0 },
        { "ARMHB000", 0 },
        {},
@@ -3064,8 +3064,8 @@ static struct platform_driver arm_sbsa_uart_platform_driver = {
        .driver = {
                .name   = "sbsa-uart",
                .pm     = &pl011_dev_pm_ops,
-               .of_match_table = of_match_ptr(sbsa_uart_of_match),
-               .acpi_match_table = ACPI_PTR(sbsa_uart_acpi_match),
+               .of_match_table = sbsa_uart_of_match,
+               .acpi_match_table = sbsa_uart_acpi_match,
                .suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_AMBA_PL011),
        },
 };

diff --git a/drivers/tty/serial/ma35d1_serial.c b/drivers/tty/serial/ma35d1_serial.c
index 8dcad52eedfd1c1cc0a293533e12d9afa4592d9a..285b0fe41a86ada417aeaf56c94ad43ca691b582 100644 (file)
--- a/drivers/tty/serial/ma35d1_serial.c
+++ b/drivers/tty/serial/ma35d1_serial.c
@@ -799,7 +799,7 @@ static struct platform_driver ma35d1serial_driver = {
        .resume     = ma35d1serial_resume,
        .driver     = {
                .name   = "ma35d1-uart",
-               .of_match_table = of_match_ptr(ma35d1_serial_of_match),
+               .of_match_table = ma35d1_serial_of_match,
        },
 };