Skip to content

Commit

Permalink
Fix up remaining devm_ioremap_nocache() in SGI IOC3 8250 UART driver
Browse files Browse the repository at this point in the history
This is a merge error on my part - the driver was merged into mainline
by commit c5951e7 ("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 6a1000b ("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>
  • Loading branch information
Linus Torvalds committed Feb 8, 2020
1 parent 4ef1a30 commit b0ef7cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/tty/serial/8250/8250_ioc3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit b0ef7cd

Please sign in to comment.