* [PATCH v2] serial: mvebu-uart: drop of_match_ptr for ID table
@ 2026-11-17 14:21 Bramuel Barack
2026-11-17 14:35 ` sashiko-bot
0 siblings, 1 reply; 2+ messages in thread
From: Bramuel Barack @ 2026-11-17 14:21 UTC (permalink / raw)
To: Pali Rohár, Greg Kroah-Hartman, Jiri Slaby
Cc: linux-serial, linux-kernel, Bramuel Barack
mvebu_uart_of_match[] is always compiled in and already referenced
directly in mvebu_uart_probe(). Wrapping it in of_match_ptr() in
mvebu_uart_platform_driver is redundant and prevents ACPI PRP0001
matching when CONFIG_OF is disabled.
Switch mvebu_uart_probe() from of_match_device() to
device_get_match_data() and check for NULL so both Device Tree and
ACPI PRP0001 bindings resolve match data safely. Also drop the
now-unused forward declaration and <linux/of_device.h> include.
Signed-off-by: Bramuel Barack <bramwelbarack89@gmail.com>
---
Changes in v2:
- Use device_get_match_data() with a NULL check in mvebu_uart_probe()
to prevent a NULL pointer dereference on ACPI PRP0001 match.
- Drop unused forward declaration and <linux/of_device.h> include.
drivers/tty/serial/mvebu-uart.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
index 33ea496c93b2..509690748ef7 100644
--- a/drivers/tty/serial/mvebu-uart.c
+++ b/drivers/tty/serial/mvebu-uart.c
@@ -18,10 +18,10 @@
#include <linux/math64.h>
#include <linux/of.h>
#include <linux/of_address.h>
-#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/slab.h>
@@ -154,7 +154,7 @@ struct mvebu_uart {
struct uart_port *port;
struct clk *clk;
int irq[UART_IRQ_COUNT];
- struct mvebu_uart_driver_data *data;
+ const struct mvebu_uart_driver_data *data;
#if defined(CONFIG_PM)
struct mvebu_uart_pm_regs pm_regs;
#endif /* CONFIG_PM */
@@ -859,15 +859,12 @@ static const struct dev_pm_ops mvebu_uart_pm_ops = {
};
#endif /* CONFIG_PM */
-static const struct of_device_id mvebu_uart_of_match[];
/* Counter to keep track of each UART port id when not using CONFIG_OF */
static int uart_num_counter;
static int mvebu_uart_probe(struct platform_device *pdev)
{
- const struct of_device_id *match = of_match_device(mvebu_uart_of_match,
- &pdev->dev);
struct uart_port *port;
struct mvebu_uart *mvuart;
struct resource *reg;
@@ -919,7 +916,10 @@ static int mvebu_uart_probe(struct platform_device *pdev)
return -ENOMEM;
/* Get controller data depending on the compatible string */
- mvuart->data = (struct mvebu_uart_driver_data *)match->data;
+ mvuart->data = device_get_match_data(&pdev->dev);
+ if (!mvuart->data)
+ return -ENODEV;
+
mvuart->port = port;
port->private_data = mvuart;
@@ -1016,7 +1016,7 @@ static struct platform_driver mvebu_uart_platform_driver = {
.probe = mvebu_uart_probe,
.driver = {
.name = "mvebu-uart",
- .of_match_table = of_match_ptr(mvebu_uart_of_match),
+ .of_match_table = mvebu_uart_of_match,
.suppress_bind_attrs = true,
#if defined(CONFIG_PM)
.pm = &mvebu_uart_pm_ops,
--
2.56.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-17 14:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 14:21 [PATCH v2] serial: mvebu-uart: drop of_match_ptr for ID table Bramuel Barack
2026-11-17 14:35 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox