diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-01-06 09:43:50 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-01-06 09:45:59 +0100 |
| commit | 4bdc0d676a643140bdf17dbf7eafedee3d496a3c (patch) | |
| tree | 2186c48b764fcc52016904d39af3486b8691fd63 /sound/pci/rme9652 | |
| parent | d23cc635889cacdbb84de7ca099c2ee0a522fd0c (diff) | |
| download | linux-4bdc0d676a643140bdf17dbf7eafedee3d496a3c.tar.bz2 | |
remove ioremap_nocache and devm_ioremap_nocache
ioremap has provided non-cached semantics by default since the Linux 2.6
days, so remove the additional ioremap_nocache interface.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'sound/pci/rme9652')
| -rw-r--r-- | sound/pci/rme9652/hdsp.c | 2 | ||||
| -rw-r--r-- | sound/pci/rme9652/hdspm.c | 2 | ||||
| -rw-r--r-- | sound/pci/rme9652/rme9652.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index cd20af465d8e..dfb06546ff25 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -5220,7 +5220,7 @@ static int snd_hdsp_create(struct snd_card *card, if ((err = pci_request_regions(pci, "hdsp")) < 0) return err; hdsp->port = pci_resource_start(pci, 0); - if ((hdsp->iobase = ioremap_nocache(hdsp->port, HDSP_IO_EXTENT)) == NULL) { + if ((hdsp->iobase = ioremap(hdsp->port, HDSP_IO_EXTENT)) == NULL) { dev_err(hdsp->card->dev, "unable to remap region 0x%lx-0x%lx\n", hdsp->port, hdsp->port + HDSP_IO_EXTENT - 1); return -EBUSY; diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 75c06a7cc779..e2214ba4a38d 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -6594,7 +6594,7 @@ static int snd_hdspm_create(struct snd_card *card, dev_dbg(card->dev, "grabbed memory region 0x%lx-0x%lx\n", hdspm->port, hdspm->port + io_extent - 1); - hdspm->iobase = ioremap_nocache(hdspm->port, io_extent); + hdspm->iobase = ioremap(hdspm->port, io_extent); if (!hdspm->iobase) { dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n", hdspm->port, hdspm->port + io_extent - 1); diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index ef5c2f8e17c7..bb9130747fbb 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c @@ -2466,7 +2466,7 @@ static int snd_rme9652_create(struct snd_card *card, if ((err = pci_request_regions(pci, "rme9652")) < 0) return err; rme9652->port = pci_resource_start(pci, 0); - rme9652->iobase = ioremap_nocache(rme9652->port, RME9652_IO_EXTENT); + rme9652->iobase = ioremap(rme9652->port, RME9652_IO_EXTENT); if (rme9652->iobase == NULL) { dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n", rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1); |