git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove ioremap_nocache and devm_ioremap_nocache
[sfrench/cifs-2.6.git]
/
drivers
/
bcma
/
scan.c
diff --git
a/drivers/bcma/scan.c
b/drivers/bcma/scan.c
index 4a2d1b235fb5af3e51ac8b044e6a18aed5753cec..fd546c51b076ad93c03a0f32ad37ee83b4a7434b 100644
(file)
--- a/
drivers/bcma/scan.c
+++ b/
drivers/bcma/scan.c
@@
-425,11
+425,11
@@
static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
}
}
if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
}
}
if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
- core->io_addr = ioremap
_nocache
(core->addr, BCMA_CORE_SIZE);
+ core->io_addr = ioremap(core->addr, BCMA_CORE_SIZE);
if (!core->io_addr)
return -ENOMEM;
if (core->wrap) {
if (!core->io_addr)
return -ENOMEM;
if (core->wrap) {
- core->io_wrap = ioremap
_nocache
(core->wrap,
+ core->io_wrap = ioremap(core->wrap,
BCMA_CORE_SIZE);
if (!core->io_wrap) {
iounmap(core->io_addr);
BCMA_CORE_SIZE);
if (!core->io_wrap) {
iounmap(core->io_addr);
@@
-472,7
+472,7
@@
int bcma_bus_scan(struct bcma_bus *bus)
erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
- eromptr = ioremap
_nocache
(erombase, BCMA_CORE_SIZE);
+ eromptr = ioremap(erombase, BCMA_CORE_SIZE);
if (!eromptr)
return -ENOMEM;
} else {
if (!eromptr)
return -ENOMEM;
} else {