Skip to content

Commit 451a73c

Browse files
andy-shevgregkh
authored andcommitted
serial: 8250_ingenic: Switch to use platform_get_irq()
platform_get_irq() provides an established error code and error message. Also, it's better to use dedicated API to retrieve Linux IRQ resource. Signed-off-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e914072 commit 451a73c

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

drivers/tty/serial/8250/8250_ingenic.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,11 @@ static unsigned int ingenic_uart_serial_in(struct uart_port *p, int offset)
207207
static int ingenic_uart_probe(struct platform_device *pdev)
208208
{
209209
struct uart_8250_port uart = {};
210-
struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
211-
struct resource *irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
212210
struct ingenic_uart_data *data;
213211
const struct ingenic_uart_config *cdata;
214212
const struct of_device_id *match;
215-
int err, line;
213+
struct resource *regs;
214+
int irq, err, line;
216215

217216
match = of_match_device(of_match, &pdev->dev);
218217
if (!match) {
@@ -221,8 +220,13 @@ static int ingenic_uart_probe(struct platform_device *pdev)
221220
}
222221
cdata = match->data;
223222

224-
if (!regs || !irq) {
225-
dev_err(&pdev->dev, "no registers/irq defined\n");
223+
irq = platform_get_irq(pdev, 0);
224+
if (irq < 0)
225+
return irq;
226+
227+
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
228+
if (!regs) {
229+
dev_err(&pdev->dev, "no registers defined\n");
226230
return -EINVAL;
227231
}
228232

@@ -238,7 +242,7 @@ static int ingenic_uart_probe(struct platform_device *pdev)
238242
uart.port.regshift = 2;
239243
uart.port.serial_out = ingenic_uart_serial_out;
240244
uart.port.serial_in = ingenic_uart_serial_in;
241-
uart.port.irq = irq->start;
245+
uart.port.irq = irq;
242246
uart.port.dev = &pdev->dev;
243247
uart.port.fifosize = cdata->fifosize;
244248
uart.tx_loadsz = cdata->tx_loadsz;

0 commit comments

Comments
 (0)