serial: esp32_acm: Add explicit platform_device.h include
PATCH 1/2 serial: esp32_acm: Add explicit platform_device.h include
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it was merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. Soon the implicit includes are going to be removed.
--- drivers/tty/serial/esp32_acm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/esp32_acm.c +1 -1
@@ -8,7 +8,7 @@#include <linux/irq.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/serial_core.h> #include <linux/slab.h> #include <linux/tty_flip.h>
Signature · 1 line
2.42.0
PATCH 2/2 serial: esp32_uart: Use device_get_match_data()
Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers.
Error checking for matching was not necessary as matching is always successful if we're already in probe and the match tables always have data pointers.
--- drivers/tty/serial/esp32_uart.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/tty/serial/esp32_uart.c +3 -7
@@ -9,7 +9,8 @@#include <linux/irq.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/property.h> #include <linux/serial_core.h> #include <linux/slab.h> #include <linux/tty_flip.h>
@@ -678,16 +679,11 @@ static struct uart_driver esp32_uart_reg = {static int esp32_uart_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node; -static const struct of_device_id *match;struct uart_port *port;struct esp32_port *sport;struct resource *res;int ret; - match =of_match_device (esp32_uart_dt_ids, &pdev->dev); -if (!match) -return -ENODEV ; - sport =devm_kzalloc (&pdev->dev,sizeof (*sport),GFP_KERNEL );if (!sport)return -ENOMEM ;
@@ -728,7 +724,7 @@ static int esp32_uart_probe(struct platform_device *pdev) port->flags =UPF_BOOT_AUTOCONF ; port->has_sysrq =1 ; port->fifosize =ESP32_UART_TX_FIFO_SIZE ; - port->private_data = (void *)match->data; + port->private_data = (void *)device_get_match_data (&pdev->dev); esp32_uart_ports[port->line] = sport;
Signature · 1 line
2.42.0