]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Fix up remaining devm_ioremap_nocache() in SGI IOC3 8250 UART driver
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Feb 2020 22:19:39 +0000 (14:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Feb 2020 22:19:39 +0000 (14:19 -0800)
This is a merge error on my part - the driver was merged into mainline
by commit 0686f032cfe3 ("Merge tag 'mips_5.6' of git://../mips/linux")
over a week ago, but nobody apparently noticed that it didn't actually
build due to still having a reference to the devm_ioremap_nocache()
function, removed a few days earlier through commit e2b45a40eb4f ("Merge
tag 'ioremap-5.6' of git://../ioremap").

Apparently this didn't get any build testing anywhere.  Not perhaps all
that surprising: it's restricted to 64-bit MIPS only, and only with the
new SGI_MFD_IOC3 support enabled.

I only noticed because the ioremap conflicts in the ARM SoC driver
update made me check there weren't any others hiding, and I found this
one.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/tty/serial/8250/8250_ioc3.c

index 4c405f1b9c671acd211dfe7fcdcbf82eb6637e0e..d5a39e105a76f5bfbd9e3718c91d52ca5a79fbff 100644 (file)
@@ -47,7 +47,7 @@ static int serial8250_ioc3_probe(struct platform_device *pdev)
        if (!data)
                return -ENOMEM;
 
-       membase = devm_ioremap_nocache(&pdev->dev, r->start, resource_size(r));
+       membase = devm_ioremap(&pdev->dev, r->start, resource_size(r));
        if (!membase)
                return -ENOMEM;