mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
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>
This commit is contained in:
@@ -48,7 +48,7 @@ int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb)
|
||||
return 0;
|
||||
|
||||
ccb->setup_done = 1;
|
||||
ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);
|
||||
ccb->mii = ioremap(ccb->core->addr_s[1], BCMA_CORE_SIZE);
|
||||
if (!ccb->mii)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
|
||||
if (unlikely(!addr))
|
||||
goto out;
|
||||
err = -ENOMEM;
|
||||
mmio = ioremap_nocache(addr, sizeof(val));
|
||||
mmio = ioremap(addr, sizeof(val));
|
||||
if (!mmio)
|
||||
goto out;
|
||||
|
||||
@@ -180,7 +180,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
|
||||
if (unlikely(!addr))
|
||||
goto out;
|
||||
err = -ENOMEM;
|
||||
mmio = ioremap_nocache(addr, sizeof(val));
|
||||
mmio = ioremap(addr, sizeof(val));
|
||||
if (!mmio)
|
||||
goto out;
|
||||
|
||||
@@ -515,7 +515,7 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
|
||||
/* Ok, ready to run, register it to the system.
|
||||
* The following needs change, if we want to port hostmode
|
||||
* to non-MIPS platform. */
|
||||
io_map_base = (unsigned long)ioremap_nocache(pc_host->mem_resource.start,
|
||||
io_map_base = (unsigned long)ioremap(pc_host->mem_resource.start,
|
||||
resource_size(&pc_host->mem_resource));
|
||||
pc_host->pci_controller.io_map_base = io_map_base;
|
||||
set_io_port_base(pc_host->pci_controller.io_map_base);
|
||||
|
||||
@@ -172,7 +172,7 @@ int __init bcma_host_soc_register(struct bcma_soc *soc)
|
||||
/* iomap only first core. We have to read some register on this core
|
||||
* to scan the bus.
|
||||
*/
|
||||
bus->mmio = ioremap_nocache(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);
|
||||
bus->mmio = ioremap(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);
|
||||
if (!bus->mmio)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
@@ -425,11 +425,11 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
|
||||
}
|
||||
}
|
||||
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) {
|
||||
core->io_wrap = ioremap_nocache(core->wrap,
|
||||
core->io_wrap = ioremap(core->wrap,
|
||||
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) {
|
||||
eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
|
||||
eromptr = ioremap(erombase, BCMA_CORE_SIZE);
|
||||
if (!eromptr)
|
||||
return -ENOMEM;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user