Skip to content

Commit 4596d2b

Browse files
andy-shevgregkh
authored andcommitted
serial: 8250_platform: Switch to use platform_get_mem_or_io()
Switch to use new platform_get_mem_or_io() instead of home grown analogue. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20240812154901.1068407-6-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 32e0a65 commit 4596d2b

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

drivers/tty/serial/8250/8250_platform.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,23 @@ static int serial8250_platform_probe(struct platform_device *pdev)
113113
unsigned char iotype;
114114
int ret, line;
115115

116-
regs = platform_get_resource(pdev, IORESOURCE_IO, 0);
117-
if (regs) {
116+
regs = platform_get_mem_or_io(pdev, 0);
117+
if (!regs)
118+
return dev_err_probe(dev, -EINVAL, "no registers defined\n");
119+
120+
switch (resource_type(regs)) {
121+
case IORESOURCE_IO:
118122
uart.port.iobase = regs->start;
119123
iotype = UPIO_PORT;
120-
} else {
121-
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
122-
if (!regs) {
123-
dev_err(dev, "no registers defined\n");
124-
return -EINVAL;
125-
}
126-
124+
break;
125+
case IORESOURCE_MEM:
127126
uart.port.mapbase = regs->start;
128127
uart.port.mapsize = resource_size(regs);
129128
uart.port.flags = UPF_IOREMAP;
130129
iotype = UPIO_MEM;
130+
break;
131+
default:
132+
return -EINVAL;
131133
}
132134

133135
/* Default clock frequency*/

0 commit comments

Comments
 (0)