diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 13:03:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 13:03:00 -0800 |
| commit | 6a1000bd27035bba17ede9dc915166276a811edb (patch) | |
| tree | 92389983cc8bd09ba5b1cdebabfcad882f8ce3f3 /drivers/input/serio/gscps2.c | |
| parent | 9dd70e2880b8c8386097de51564c60352b3e4070 (diff) | |
| parent | 4bdc0d676a643140bdf17dbf7eafedee3d496a3c (diff) | |
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 'drivers/input/serio/gscps2.c')
| -rw-r--r-- | drivers/input/serio/gscps2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 96f9b5397367..2f9775de3c5b 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -349,7 +349,7 @@ static int __init gscps2_probe(struct parisc_device *dev) ps2port->port = serio; ps2port->padev = dev; - ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4); + ps2port->addr = ioremap(hpa, GSC_STATUS + 4); spin_lock_init(&ps2port->lock); gscps2_reset(ps2port); |