Skip to content

Commit b5ad18a

Browse files
arndbgregkh
authored andcommitted
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>
1 parent 87975ca commit b5ad18a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/tty/serial/amba-pl011.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3051,7 +3051,7 @@ static const struct of_device_id sbsa_uart_of_match[] = {
30513051
};
30523052
MODULE_DEVICE_TABLE(of, sbsa_uart_of_match);
30533053

3054-
static const struct acpi_device_id __maybe_unused sbsa_uart_acpi_match[] = {
3054+
static const struct acpi_device_id sbsa_uart_acpi_match[] = {
30553055
{ "ARMH0011", 0 },
30563056
{ "ARMHB000", 0 },
30573057
{},
@@ -3064,8 +3064,8 @@ static struct platform_driver arm_sbsa_uart_platform_driver = {
30643064
.driver = {
30653065
.name = "sbsa-uart",
30663066
.pm = &pl011_dev_pm_ops,
3067-
.of_match_table = of_match_ptr(sbsa_uart_of_match),
3068-
.acpi_match_table = ACPI_PTR(sbsa_uart_acpi_match),
3067+
.of_match_table = sbsa_uart_of_match,
3068+
.acpi_match_table = sbsa_uart_acpi_match,
30693069
.suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_AMBA_PL011),
30703070
},
30713071
};

drivers/tty/serial/ma35d1_serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ static struct platform_driver ma35d1serial_driver = {
799799
.resume = ma35d1serial_resume,
800800
.driver = {
801801
.name = "ma35d1-uart",
802-
.of_match_table = of_match_ptr(ma35d1_serial_of_match),
802+
.of_match_table = ma35d1_serial_of_match,
803803
},
804804
};
805805

0 commit comments

Comments
 (0)