tty: serial: pl011: remove incorrect of_match_ptr annotation
Subsystems (3)
PATCH 1/1 tty: serial: pl011: remove incorrect of_match_ptr annotation
From: Arnd Bergmann <[email protected]>
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 <[email protected]>
--- drivers/tty/serial/amba-pl011.c | 6 +++--- drivers/tty/serial/ma35d1_serial.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/tty/serial/amba-pl011.c +3 -3
@@ -3001,7 +3001,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 }, {},
@@ -3014,8 +3014,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), }, };
drivers/tty/serial/ma35d1_serial.c +1 -1
@@ -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, }, };
Signature · 1 line
2.39.5