diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 22:03:00 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 22:03:00 +0100 |
commit | 6a1000bd27035bba17ede9dc915166276a811edb (patch) | |
tree | 92389983cc8bd09ba5b1cdebabfcad882f8ce3f3 /sound/pci/rme96.c | |
parent | Merge tag 'for-5.6/libata-2020-01-27' of git://git.kernel.dk/linux-block (diff) | |
parent | remove ioremap_nocache and devm_ioremap_nocache (diff) | |
download | linux-6a1000bd27035bba17ede9dc915166276a811edb.tar.xz linux-6a1000bd27035bba17ede9dc915166276a811edb.zip |
Merge tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap
Pull ioremap updates from Christoph Hellwig:
"Remove the ioremap_nocache API (plus wrappers) that are always
identical to ioremap"
* tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap:
remove ioremap_nocache and devm_ioremap_nocache
MIPS: define ioremap_nocache to ioremap
Diffstat (limited to 'sound/pci/rme96.c')
-rw-r--r-- | sound/pci/rme96.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index 64ab55772eae..db6033074ace 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c @@ -1619,7 +1619,7 @@ snd_rme96_create(struct rme96 *rme96) return err; rme96->port = pci_resource_start(rme96->pci, 0); - rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE); + rme96->iobase = ioremap(rme96->port, RME96_IO_SIZE); if (!rme96->iobase) { dev_err(rme96->card->dev, "unable to remap memory region 0x%lx-0x%lx\n", |