diff options
| author | Rob Herring <robh@kernel.org> | 2021-12-15 16:48:00 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-17 17:56:34 +0100 |
| commit | f087f01ca2c5ea846fb798f09f4106b551c32147 (patch) | |
| tree | e6a7f4da9abc3b8dde7dafc0a31ed2865e899d9d /drivers/tty | |
| parent | 26baf4b66c57596d7827a8e4f60a2d2b0401fe6e (diff) | |
serial: lantiq: Use platform_get_irq() to get the interrupt
Use the preferred platform_get_irq() call to retrieve the interrupts. These
have the advantage of working with deferred probe and gets us one step
closer to removing of_irq_to_resource_table().
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20211215224800.1984391-1-robh@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/lantiq.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c index 497b334bc845..bb059418cb82 100644 --- a/drivers/tty/serial/lantiq.c +++ b/drivers/tty/serial/lantiq.c @@ -16,8 +16,6 @@ #include <linux/ioport.h> #include <linux/lantiq.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/serial.h> #include <linux/serial_core.h> @@ -728,19 +726,19 @@ static struct uart_driver lqasc_reg = { static int fetch_irq_lantiq(struct device *dev, struct ltq_uart_port *ltq_port) { struct uart_port *port = <q_port->port; - struct resource irqres[3]; - int ret; + struct platform_device *pdev = to_platform_device(dev); - ret = of_irq_to_resource_table(dev->of_node, irqres, 3); - if (ret != 3) { - dev_err(dev, - "failed to get IRQs for serial port\n"); - return -ENODEV; - } - ltq_port->tx_irq = irqres[0].start; - ltq_port->rx_irq = irqres[1].start; - ltq_port->err_irq = irqres[2].start; - port->irq = irqres[0].start; + ltq_port->tx_irq = platform_get_irq(pdev, 0); + if (ltq_port->tx_irq < 0) + return ltq_port->tx_irq; + ltq_port->rx_irq = platform_get_irq(pdev, 1); + if (ltq_port->rx_irq < 0) + return ltq_port->rx_irq; + ltq_port->err_irq = platform_get_irq(pdev, 2); + if (ltq_port->err_irq < 0) + return ltq_port->err_irq; + + port->irq = ltq_port->tx_irq; return 0; } @@ -793,7 +791,7 @@ static int fetch_irq_intel(struct device *dev, struct ltq_uart_port *ltq_port) struct uart_port *port = <q_port->port; int ret; - ret = of_irq_get(dev->of_node, 0); + ret = platform_get_irq(to_platform_device(dev), 0); if (ret < 0) { dev_err(dev, "failed to fetch IRQ for serial port\n"); return ret; |