OSDN Git Service

remove ioremap_nocache and devm_ioremap_nocache
authorChristoph Hellwig <hch@lst.de>
Mon, 6 Jan 2020 08:43:50 +0000 (09:43 +0100)
committerChristoph Hellwig <hch@lst.de>
Mon, 6 Jan 2020 08:45:59 +0000 (09:45 +0100)
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>
368 files changed:
Documentation/driver-api/driver-model/devres.rst
Documentation/sound/kernel-api/writing-an-alsa-driver.rst
Documentation/x86/pat.rst
arch/alpha/include/asm/io.h
arch/arm/include/asm/io.h
arch/arm/mach-bcm/platsmp.c
arch/arm/mach-davinci/devices.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-shmobile/platsmp-apmu.c
arch/arm/mach-shmobile/pm-rcar-gen2.c
arch/arm/mach-shmobile/setup-r8a7740.c
arch/arm/mach-shmobile/setup-r8a7778.c
arch/hexagon/include/asm/io.h
arch/ia64/include/asm/vga.h
arch/ia64/kernel/cyclone.c
arch/m68k/include/asm/kmap.h
arch/mips/ar7/clock.c
arch/mips/ar7/gpio.c
arch/mips/ar7/platform.c
arch/mips/ath25/ar2315.c
arch/mips/ath25/ar5312.c
arch/mips/ath25/board.c
arch/mips/ath79/common.c
arch/mips/ath79/setup.c
arch/mips/cavium-octeon/setup.c
arch/mips/generic/board-ocelot.c
arch/mips/include/asm/io.h
arch/mips/kernel/mips-cm.c
arch/mips/kernel/mips-cpc.c
arch/mips/lantiq/falcon/sysctrl.c
arch/mips/lantiq/irq.c
arch/mips/lantiq/xway/sysctrl.c
arch/mips/loongson2ef/common/reset.c
arch/mips/loongson32/common/prom.c
arch/mips/loongson32/common/reset.c
arch/mips/loongson32/common/time.c
arch/mips/loongson64/reset.c
arch/mips/mti-malta/malta-dtshim.c
arch/mips/pci/pci-alchemy.c
arch/mips/pci/pci-ar2315.c
arch/mips/pci/pci-bcm63xx.c
arch/mips/pci/pci-rt2880.c
arch/mips/pic32/pic32mzda/early_console.c
arch/mips/pic32/pic32mzda/early_pin.c
arch/mips/pmcs-msp71xx/msp_serial.c
arch/mips/ralink/irq.c
arch/mips/ralink/of.c
arch/mips/rb532/devices.c
arch/mips/rb532/gpio.c
arch/mips/rb532/prom.c
arch/mips/rb532/setup.c
arch/mips/sni/rm200.c
arch/parisc/include/asm/io.h
arch/parisc/kernel/perf.c
arch/powerpc/include/asm/io.h
arch/sh/boards/board-sh7785lcr.c
arch/sh/boards/mach-cayman/irq.c
arch/sh/boards/mach-cayman/setup.c
arch/sh/boards/mach-sdk7786/fpga.c
arch/sh/drivers/heartbeat.c
arch/sh/drivers/pci/pci-sh5.c
arch/sh/include/asm/io.h
arch/sh/kernel/cpu/irq/intc-sh5.c
arch/sh/kernel/cpu/sh2/smp-j2.c
arch/sh/kernel/cpu/sh5/clock-sh5.c
arch/sh/kernel/dma-coherent.c
arch/sparc/include/asm/io_64.h
arch/unicore32/include/asm/io.h
arch/x86/kernel/apb_timer.c
arch/x86/kernel/hpet.c
arch/x86/kernel/quirks.c
arch/x86/kernel/tboot.c
arch/x86/mm/testmmiotrace.c
arch/x86/pci/mmconfig_64.c
drivers/acpi/acpi_lpit.c
drivers/ata/pata_arasan_cf.c
drivers/ata/pata_octeon_cf.c
drivers/ata/pata_rb532_cf.c
drivers/atm/eni.c
drivers/bcma/driver_chipcommon_b.c
drivers/bcma/driver_pci_host.c
drivers/bcma/host_soc.c
drivers/bcma/scan.c
drivers/block/umem.c
drivers/bus/fsl-mc/mc-io.c
drivers/char/agp/generic.c
drivers/char/agp/intel-gtt.c
drivers/char/applicom.c
drivers/char/hw_random/intel-rng.c
drivers/char/hw_random/octeon-rng.c
drivers/clk/renesas/clk-rz.c
drivers/clocksource/sh_cmt.c
drivers/clocksource/sh_mtu2.c
drivers/clocksource/sh_tmu.c
drivers/cpufreq/pcc-cpufreq.c
drivers/crypto/hifn_795x.c
drivers/dma/altera-msgdma.c
drivers/edac/i3000_edac.c
drivers/edac/i3200_edac.c
drivers/edac/i82975x_edac.c
drivers/edac/ie31200_edac.c
drivers/edac/x38_edac.c
drivers/firewire/nosy.c
drivers/firmware/broadcom/bcm47xx_nvram.c
drivers/gpu/drm/gma500/gtt.c
drivers/gpu/drm/gma500/psb_drv.c
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/msm/msm_drv.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/sti/sti_dvo.c
drivers/gpu/drm/sti/sti_hda.c
drivers/gpu/drm/sti/sti_hdmi.c
drivers/gpu/drm/sti/sti_tvout.c
drivers/gpu/drm/sti/sti_vtg.c
drivers/gpu/drm/tilcdc/tilcdc_drv.c
drivers/gpu/drm/ttm/ttm_bo_util.c
drivers/hwmon/i5k_amb.c
drivers/i2c/busses/i2c-highlander.c
drivers/i2c/busses/i2c-pmcmsp.c
drivers/infiniband/hw/bnxt_re/qplib_fp.c
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
drivers/infiniband/hw/bnxt_re/qplib_res.c
drivers/infiniband/hw/hfi1/pcie.c
drivers/infiniband/hw/qib/qib_iba7322.c
drivers/infiniband/hw/qib/qib_init.c
drivers/infiniband/hw/qib/qib_pcie.c
drivers/input/keyboard/pxa930_rotary.c
drivers/input/keyboard/sh_keysc.c
drivers/input/mouse/pxa930_trkball.c
drivers/input/serio/gscps2.c
drivers/iommu/amd_iommu_init.c
drivers/ipack/carriers/tpci200.c
drivers/ipack/devices/ipoctal.c
drivers/irqchip/irq-mips-gic.c
drivers/irqchip/irq-renesas-intc-irqpin.c
drivers/media/common/videobuf2/videobuf2-vmalloc.c
drivers/media/pci/cx18/cx18-driver.c
drivers/media/pci/ivtv/ivtv-driver.c
drivers/media/platform/davinci/dm355_ccdc.c
drivers/media/platform/davinci/dm644x_ccdc.c
drivers/media/platform/davinci/isif.c
drivers/media/platform/tegra-cec/tegra_cec.c
drivers/misc/cardreader/rtsx_pcr.c
drivers/misc/mic/scif/scif_nodeqp.c
drivers/misc/pti.c
drivers/mmc/host/sdhci-acpi.c
drivers/mmc/host/via-sdmmc.c
drivers/mtd/devices/bcm47xxsflash.c
drivers/mtd/maps/amd76xrom.c
drivers/mtd/maps/ck804xrom.c
drivers/mtd/maps/esb2rom.c
drivers/mtd/maps/ichxrom.c
drivers/mtd/maps/intel_vr_nor.c
drivers/mtd/maps/l440gx.c
drivers/mtd/maps/netsc520.c
drivers/mtd/maps/nettel.c
drivers/mtd/maps/pci.c
drivers/mtd/maps/sc520cdp.c
drivers/mtd/maps/scb2_flash.c
drivers/mtd/maps/ts5500_flash.c
drivers/mtd/nand/raw/au1550nd.c
drivers/mtd/nand/raw/denali_pci.c
drivers/mtd/nand/raw/fsl_upm.c
drivers/net/can/at91_can.c
drivers/net/can/cc770/cc770_isa.c
drivers/net/can/sja1000/sja1000_isa.c
drivers/net/can/sja1000/sja1000_platform.c
drivers/net/can/softing/softing_main.c
drivers/net/ethernet/alacritech/slicoss.c
drivers/net/ethernet/altera/altera_tse_main.c
drivers/net/ethernet/amd/au1000_eth.c
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
drivers/net/ethernet/atheros/ag71xx.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/sb1250-mac.c
drivers/net/ethernet/brocade/bna/bnad.c
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
drivers/net/ethernet/dec/tulip/de2104x.c
drivers/net/ethernet/ethoc.c
drivers/net/ethernet/i825xx/sni_82596.c
drivers/net/ethernet/korina.c
drivers/net/ethernet/lantiq_etop.c
drivers/net/ethernet/marvell/skge.c
drivers/net/ethernet/marvell/sky2.c
drivers/net/ethernet/natsemi/ns83820.c
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/ethernet/sfc/efx.c
drivers/net/ethernet/sfc/falcon/efx.c
drivers/net/ethernet/smsc/smsc911x.c
drivers/net/ethernet/ti/netcp_core.c
drivers/net/ethernet/xilinx/ll_temac_main.c
drivers/net/fddi/defxx.c
drivers/net/fddi/defza.c
drivers/net/fjes/fjes_hw.c
drivers/net/wan/wanxl.c
drivers/net/wireless/ath/ath10k/ahb.c
drivers/net/wireless/ath/ath5k/ahb.c
drivers/net/wireless/ath/ath9k/ahb.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
drivers/net/wireless/intel/ipw2x00/ipw2100.c
drivers/opp/ti-opp-supply.c
drivers/parisc/ccio-dma.c
drivers/parisc/dino.c
drivers/parisc/eisa.c
drivers/parisc/iosapic.c
drivers/parisc/lba_pci.c
drivers/parisc/sba_iommu.c
drivers/pci/controller/dwc/pci-dra7xx.c
drivers/pci/controller/dwc/pcie-designware-ep.c
drivers/pci/msi.c
drivers/pci/pci.c
drivers/pci/quirks.c
drivers/pinctrl/bcm/pinctrl-ns2-mux.c
drivers/pinctrl/bcm/pinctrl-nsp-mux.c
drivers/pinctrl/freescale/pinctrl-imx1-core.c
drivers/pinctrl/pinctrl-amd.c
drivers/platform/x86/intel_scu_ipc.c
drivers/platform/x86/intel_telemetry_pltdrv.c
drivers/platform/x86/pmc_atom.c
drivers/platform/x86/samsung-laptop.c
drivers/regulator/ti-abb-regulator.c
drivers/rtc/rtc-sh.c
drivers/scsi/aic7xxx/aic79xx_osm_pci.c
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
drivers/scsi/arcmsr/arcmsr_hba.c
drivers/scsi/be2iscsi/be_main.c
drivers/scsi/bnx2fc/bnx2fc_hwi.c
drivers/scsi/bnx2i/bnx2i_hwi.c
drivers/scsi/csiostor/csio_init.c
drivers/scsi/hpsa.c
drivers/scsi/lasi700.c
drivers/scsi/megaraid/megaraid_mbox.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/myrb.c
drivers/scsi/myrs.c
drivers/scsi/pcmcia/nsp_cs.c
drivers/scsi/qla2xxx/qla_mr.c
drivers/scsi/smartpqi/smartpqi_init.c
drivers/scsi/sni_53c710.c
drivers/scsi/sun3x_esp.c
drivers/scsi/zalon.c
drivers/scsi/zorro_esp.c
drivers/sh/clk/core.c
drivers/sh/intc/core.c
drivers/sh/intc/userimask.c
drivers/soc/tegra/flowctrl.c
drivers/soc/tegra/fuse/fuse-tegra.c
drivers/soc/tegra/fuse/tegra-apbmisc.c
drivers/soc/tegra/pmc.c
drivers/soc/xilinx/xlnx_vcu.c
drivers/spi/spi-dw-mid.c
drivers/spi/spi-jcore.c
drivers/spi/spi-npcm-fiu.c
drivers/ssb/driver_extif.c
drivers/ssb/driver_pcicore.c
drivers/staging/gasket/gasket_core.c
drivers/staging/kpc2000/kpc2000/core.c
drivers/staging/kpc2000/kpc2000_i2c.c
drivers/staging/kpc2000/kpc2000_spi.c
drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
drivers/staging/media/allegro-dvt/allegro-core.c
drivers/staging/qlge/qlge_main.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
drivers/staging/rts5208/rtsx.c
drivers/staging/sm750fb/sm750_hw.c
drivers/staging/uwb/whc-rc.c
drivers/tc/tc.c
drivers/tty/cyclades.c
drivers/tty/mips_ejtag_fdc.c
drivers/tty/moxa.c
drivers/tty/serial/8250/8250_gsc.c
drivers/tty/serial/8250/8250_omap.c
drivers/tty/serial/8250/8250_pci.c
drivers/tty/serial/8250/8250_port.c
drivers/tty/serial/dz.c
drivers/tty/serial/lantiq.c
drivers/tty/serial/meson_uart.c
drivers/tty/serial/mux.c
drivers/tty/serial/owl-uart.c
drivers/tty/serial/pic32_uart.c
drivers/tty/serial/rda-uart.c
drivers/tty/serial/sb1250-duart.c
drivers/tty/serial/sh-sci.c
drivers/tty/serial/zs.c
drivers/tty/synclink.c
drivers/tty/synclink_gt.c
drivers/tty/synclinkmp.c
drivers/usb/core/hcd-pci.c
drivers/usb/early/xhci-dbc.c
drivers/usb/gadget/udc/amd5536udc_pci.c
drivers/usb/gadget/udc/goku_udc.c
drivers/usb/gadget/udc/net2272.c
drivers/usb/gadget/udc/net2280.c
drivers/usb/host/ehci-pmcmsp.c
drivers/usb/host/pci-quirks.c
drivers/usb/isp1760/isp1760-if.c
drivers/usb/roles/intel-xhci-usb-role-switch.c
drivers/usb/typec/ucsi/ucsi_acpi.c
drivers/vfio/pci/vfio_pci_rdwr.c
drivers/vfio/platform/reset/vfio_platform_amdxgbe.c
drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c
drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
drivers/vfio/platform/vfio_platform_common.c
drivers/video/fbdev/carminefb.c
drivers/video/fbdev/i810/i810_main.c
drivers/video/fbdev/intelfb/intelfbdrv.c
drivers/video/fbdev/kyro/fbdev.c
drivers/video/fbdev/matrox/matroxfb_base.c
drivers/video/fbdev/mbx/mbxfb.c
drivers/video/fbdev/mmp/hw/mmp_ctrl.c
drivers/video/fbdev/pm2fb.c
drivers/video/fbdev/pm3fb.c
drivers/video/fbdev/pmag-aa-fb.c
drivers/video/fbdev/pmag-ba-fb.c
drivers/video/fbdev/pmagb-b-fb.c
drivers/video/fbdev/pvr2fb.c
drivers/video/fbdev/pxa168fb.c
drivers/video/fbdev/s1d13xxxfb.c
drivers/video/fbdev/sh7760fb.c
drivers/video/fbdev/sh_mobile_lcdcfb.c
drivers/video/fbdev/sstfb.c
drivers/video/fbdev/stifb.c
drivers/video/fbdev/tdfxfb.c
drivers/video/fbdev/tgafb.c
drivers/video/fbdev/tridentfb.c
drivers/video/fbdev/valkyriefb.c
drivers/video/fbdev/vermilion/cr_pll.c
drivers/video/fbdev/vermilion/vermilion.c
drivers/video/fbdev/via/via-core.c
drivers/video/fbdev/w100fb.c
drivers/vme/boards/vme_vmivme7805.c
drivers/vme/bridges/vme_ca91cx42.c
drivers/vme/bridges/vme_tsi148.c
drivers/w1/masters/matrox_w1.c
drivers/watchdog/bcm63xx_wdt.c
drivers/watchdog/intel_scu_watchdog.c
drivers/watchdog/rc32434_wdt.c
include/asm-generic/io.h
include/asm-generic/iomap.h
include/linux/io.h
lib/devres.c
scripts/coccinelle/free/devm_free.cocci
scripts/coccinelle/free/iounmap.cocci
sound/drivers/ml403-ac97cr.c
sound/isa/msnd/msnd_pinnacle.c
sound/parisc/harmony.c
sound/pci/aw2/aw2-alsa.c
sound/pci/cs46xx/cs46xx_lib.c
sound/pci/echoaudio/echoaudio.c
sound/pci/nm256/nm256.c
sound/pci/rme32.c
sound/pci/rme96.c
sound/pci/rme9652/hdsp.c
sound/pci/rme9652/hdspm.c
sound/pci/rme9652/rme9652.c
sound/pci/sis7019.c
sound/pci/ymfpci/ymfpci_main.c
sound/soc/au1x/ac97c.c
sound/soc/au1x/i2sc.c
sound/soc/intel/atom/sst/sst_acpi.c
sound/soc/sh/fsi.c
sound/x86/intel_hdmi_audio.c
tools/testing/nvdimm/Kbuild
tools/testing/nvdimm/test/iomap.c
tools/testing/nvdimm/test/nfit_test.h

index 13046fc..20e07e4 100644 (file)
@@ -313,7 +313,6 @@ IOMAP
   devm_ioport_map()
   devm_ioport_unmap()
   devm_ioremap()
-  devm_ioremap_nocache()
   devm_ioremap_uc()
   devm_ioremap_wc()
   devm_ioremap_resource() : checks resource, requests memory region, ioremaps
index f169d58..ddef812 100644 (file)
@@ -1058,7 +1058,7 @@ and the allocation would be like below:
           return err;
   }
   chip->iobase_phys = pci_resource_start(pci, 0);
-  chip->iobase_virt = ioremap_nocache(chip->iobase_phys,
+  chip->iobase_virt = ioremap(chip->iobase_phys,
                                       pci_resource_len(pci, 0));
 
 and the corresponding destructor would be:
index 9a298fd..5d90177 100644 (file)
@@ -44,8 +44,6 @@ address range to avoid any aliasing.
 +------------------------+----------+--------------+------------------+
 | ioremap_uc             |    --    |    UC        |       UC         |
 +------------------------+----------+--------------+------------------+
-| ioremap_nocache        |    --    |    UC-       |       UC-        |
-+------------------------+----------+--------------+------------------+
 | ioremap_wc             |    --    |    --        |       WC         |
 +------------------------+----------+--------------+------------------+
 | ioremap_wt             |    --    |    --        |       WT         |
index 1989b94..d1ed5a8 100644 (file)
@@ -283,14 +283,8 @@ static inline void __iomem *ioremap(unsigned long port, unsigned long size)
        return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);
 }
 
-static inline void __iomem * ioremap_nocache(unsigned long offset,
-                                            unsigned long size)
-{
-       return ioremap(offset, size);
-}
-
-#define ioremap_wc ioremap_nocache
-#define ioremap_uc ioremap_nocache
+#define ioremap_wc ioremap
+#define ioremap_uc ioremap
 
 static inline void iounmap(volatile void __iomem *addr)
 {
index aefdabd..ab2b654 100644 (file)
@@ -356,7 +356,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from,
  *
  * Function            Memory type     Cacheability    Cache hint
  * ioremap()           Device          n/a             n/a
- * ioremap_nocache()   Device          n/a             n/a
  * ioremap_cache()     Normal          Writeback       Read allocate
  * ioremap_wc()                Normal          Non-cacheable   n/a
  * ioremap_wt()                Normal          Non-cacheable   n/a
@@ -368,13 +367,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from,
  * - unaligned accesses are "unpredictable"
  * - writes may be delayed before they hit the endpoint device
  *
- * ioremap_nocache() is the same as ioremap() as there are too many device
- * drivers using this for device registers, and documentation which tells
- * people to use it for such for this to be any different.  This is not a
- * safe fallback for memory-like mappings, or memory regions where the
- * compiler may generate unaligned accesses - eg, via inlining its own
- * memcpy.
- *
  * All normal memory mappings have the following properties:
  * - reads can be repeated with no side effects
  * - repeated reads return the last value written
index 21400b3..c9db2a9 100644 (file)
@@ -105,7 +105,7 @@ static int nsp_write_lut(unsigned int cpu)
        if (!secondary_boot_addr)
                return -EINVAL;
 
-       sku_rom_lut = ioremap_nocache((phys_addr_t)secondary_boot_addr,
+       sku_rom_lut = ioremap((phys_addr_t)secondary_boot_addr,
                                      sizeof(phys_addr_t));
        if (!sku_rom_lut) {
                pr_warn("unable to ioremap SKU-ROM LUT register for cpu %u\n", cpu);
@@ -174,7 +174,7 @@ static int kona_boot_secondary(unsigned int cpu, struct task_struct *idle)
        if (!secondary_boot_addr)
                return -EINVAL;
 
-       boot_reg = ioremap_nocache((phys_addr_t)secondary_boot_addr,
+       boot_reg = ioremap((phys_addr_t)secondary_boot_addr,
                                   sizeof(phys_addr_t));
        if (!boot_reg) {
                pr_err("unable to map boot register for cpu %u\n", cpu_id);
index 3e447d4..e650131 100644 (file)
@@ -34,7 +34,7 @@ void __iomem  *davinci_sysmod_base;
 
 void davinci_map_sysmod(void)
 {
-       davinci_sysmod_base = ioremap_nocache(DAVINCI_SYSTEM_MODULE_BASE,
+       davinci_sysmod_base = ioremap(DAVINCI_SYSTEM_MODULE_BASE,
                                              0x800);
        /*
         * Throw a bug since a lot of board initialization code depends
index e1a394a..868dc0c 100644 (file)
@@ -1008,7 +1008,7 @@ static void __init magician_init(void)
        pxa_set_udc_info(&magician_udc_info);
 
        /* Check LCD type we have */
-       cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);
+       cpld = ioremap(PXA_CS3_PHYS, 0x1000);
        if (cpld) {
                u8 board_id = __raw_readb(cpld + 0x14);
 
index 96330ef..e771ce7 100644 (file)
@@ -189,7 +189,7 @@ static void apmu_init_cpu(struct resource *res, int cpu, int bit)
        if ((cpu >= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)
                return;
 
-       apmu_cpus[cpu].iomem = ioremap_nocache(res->start, resource_size(res));
+       apmu_cpus[cpu].iomem = ioremap(res->start, resource_size(res));
        apmu_cpus[cpu].bit = bit;
 
        pr_debug("apmu ioremap %d %d %pr\n", cpu, bit, res);
index e84599d..6720814 100644 (file)
@@ -103,7 +103,7 @@ map:
        iounmap(p);
 
        /* setup reset vectors */
-       p = ioremap_nocache(RST, 0x63);
+       p = ioremap(RST, 0x63);
        bar = phys_to_sbar(res.start);
        if (has_a15) {
                writel_relaxed(bar, p + CA15BAR);
index 787d039..f760c27 100644 (file)
@@ -28,7 +28,7 @@ static void __init r8a7740_meram_workaround(void)
 {
        void __iomem *reg;
 
-       reg = ioremap_nocache(MEBUFCNTR, 4);
+       reg = ioremap(MEBUFCNTR, 4);
        if (reg) {
                iowrite32(0x01600164, reg);
                iounmap(reg);
@@ -37,9 +37,9 @@ static void __init r8a7740_meram_workaround(void)
 
 static void __init r8a7740_init_irq_of(void)
 {
-       void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
-       void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
-       void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
+       void __iomem *intc_prio_base = ioremap(0xe6900010, 0x10);
+       void __iomem *intc_msk_base = ioremap(0xe6900040, 0x10);
+       void __iomem *pfc_inta_ctrl = ioremap(0xe605807c, 0x4);
 
        irqchip_init();
 
index ce51794..2bc93f3 100644 (file)
@@ -22,7 +22,7 @@
 
 static void __init r8a7778_init_irq_dt(void)
 {
-       void __iomem *base = ioremap_nocache(0xfe700000, 0x00100000);
+       void __iomem *base = ioremap(0xfe700000, 0x00100000);
 
        BUG_ON(!base);
 
index b0dbc34..bda2a9c 100644 (file)
@@ -172,7 +172,6 @@ static inline void writel(u32 data, volatile void __iomem *addr)
 #define writel_relaxed __raw_writel
 
 void __iomem *ioremap(unsigned long phys_addr, unsigned long size);
-#define ioremap_nocache ioremap
 #define ioremap_uc(X, Y) ioremap((X), (Y))
 
 
index 30cb373..64ce0b9 100644 (file)
@@ -18,7 +18,7 @@
 extern unsigned long vga_console_iobase;
 extern unsigned long vga_console_membase;
 
-#define VGA_MAP_MEM(x,s)       ((unsigned long) ioremap_nocache(vga_console_membase + (x), s))
+#define VGA_MAP_MEM(x,s)       ((unsigned long) ioremap(vga_console_membase + (x), s))
 
 #define vga_readb(x)   (*(x))
 #define vga_writeb(x,y)        (*(y) = (x))
index f80eb7f..258d7b7 100644 (file)
@@ -50,7 +50,7 @@ int __init init_cyclone_clock(void)
 
        /* find base address */
        offset = (CYCLONE_CBAR_ADDR);
-       reg = ioremap_nocache(offset, sizeof(u64));
+       reg = ioremap(offset, sizeof(u64));
        if(!reg){
                printk(KERN_ERR "Summit chipset: Could not find valid CBAR"
                                " register.\n");
@@ -68,7 +68,7 @@ int __init init_cyclone_clock(void)
 
        /* setup PMCC */
        offset = (base + CYCLONE_PMCC_OFFSET);
-       reg = ioremap_nocache(offset, sizeof(u64));
+       reg = ioremap(offset, sizeof(u64));
        if(!reg){
                printk(KERN_ERR "Summit chipset: Could not find valid PMCC"
                                " register.\n");
@@ -80,7 +80,7 @@ int __init init_cyclone_clock(void)
 
        /* setup MPCS */
        offset = (base + CYCLONE_MPCS_OFFSET);
-       reg = ioremap_nocache(offset, sizeof(u64));
+       reg = ioremap(offset, sizeof(u64));
        if(!reg){
                printk(KERN_ERR "Summit chipset: Could not find valid MPCS"
                                " register.\n");
@@ -92,7 +92,7 @@ int __init init_cyclone_clock(void)
 
        /* map in cyclone_timer */
        offset = (base + CYCLONE_MPMC_OFFSET);
-       cyclone_timer = ioremap_nocache(offset, sizeof(u32));
+       cyclone_timer = ioremap(offset, sizeof(u32));
        if(!cyclone_timer){
                printk(KERN_ERR "Summit chipset: Could not find valid MPMC"
                                " register.\n");
index 559cb91..dec0574 100644 (file)
@@ -27,7 +27,6 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
        return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
 }
 
-#define ioremap_nocache ioremap
 #define ioremap_uc ioremap
 #define ioremap_wt ioremap_wt
 static inline void __iomem *ioremap_wt(unsigned long physaddr,
index 7de1624..95def94 100644 (file)
@@ -236,9 +236,9 @@ static void tnetd7300_set_clock(u32 shift, struct tnetd7300_clock *clock,
 
 static void __init tnetd7300_init_clocks(void)
 {
-       u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
+       u32 *bootcr = (u32 *)ioremap(AR7_REGS_DCL, 4);
        struct tnetd7300_clocks *clocks =
-                                       ioremap_nocache(UR8_REGS_CLOCKS,
+                                       ioremap(UR8_REGS_CLOCKS,
                                        sizeof(struct tnetd7300_clocks));
 
        bus_clk.rate = tnetd7300_get_clock(BUS_PLL_SOURCE_SHIFT,
@@ -320,9 +320,9 @@ static int tnetd7200_get_clock_base(int clock_id, u32 *bootcr)
 
 static void __init tnetd7200_init_clocks(void)
 {
-       u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
+       u32 *bootcr = (u32 *)ioremap(AR7_REGS_DCL, 4);
        struct tnetd7200_clocks *clocks =
-                                       ioremap_nocache(AR7_REGS_CLOCKS,
+                                       ioremap(AR7_REGS_CLOCKS,
                                        sizeof(struct tnetd7200_clocks));
        int cpu_base, cpu_mul, cpu_prediv, cpu_postdiv;
        int dsp_base, dsp_mul, dsp_prediv, dsp_postdiv;
index 2292e55..8b006ad 100644 (file)
@@ -308,7 +308,7 @@ int __init ar7_gpio_init(void)
                size = 0x1f;
        }
 
-       gpch->regs = ioremap_nocache(AR7_REGS_GPIO, size);
+       gpch->regs = ioremap(AR7_REGS_GPIO, size);
        if (!gpch->regs) {
                printk(KERN_ERR "%s: failed to ioremap regs\n",
                                        gpch->chip.label);
index 1f20282..215149a 100644 (file)
@@ -702,7 +702,7 @@ static int __init ar7_register_devices(void)
                pr_warn("unable to register usb slave: %d\n", res);
 
        /* Register watchdog only if enabled in hardware */
-       bootcr = ioremap_nocache(AR7_REGS_DCL, 4);
+       bootcr = ioremap(AR7_REGS_DCL, 4);
        val = readl(bootcr);
        iounmap(bootcr);
        if (val & AR7_WDT_HW_ENA) {
index 8da9961..24f6191 100644 (file)
@@ -262,7 +262,7 @@ void __init ar2315_plat_mem_setup(void)
        u32 config;
 
        /* Detect memory size */
-       sdram_base = ioremap_nocache(AR2315_SDRAMCTL_BASE,
+       sdram_base = ioremap(AR2315_SDRAMCTL_BASE,
                                     AR2315_SDRAMCTL_SIZE);
        memcfg = __raw_readl(sdram_base + AR2315_MEM_CFG);
        memsize   = 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_DATA_WIDTH);
@@ -272,7 +272,7 @@ void __init ar2315_plat_mem_setup(void)
        add_memory_region(0, memsize, BOOT_MEM_RAM);
        iounmap(sdram_base);
 
-       ar2315_rst_base = ioremap_nocache(AR2315_RST_BASE, AR2315_RST_SIZE);
+       ar2315_rst_base = ioremap(AR2315_RST_BASE, AR2315_RST_SIZE);
 
        /* Detect the hardware based on the device ID */
        devid = ar2315_rst_reg_read(AR2315_SREV) & AR2315_REV_CHIP;
index acd55a9..47f3e98 100644 (file)
@@ -185,7 +185,7 @@ static void __init ar5312_flash_init(void)
        void __iomem *flashctl_base;
        u32 ctl;
 
-       flashctl_base = ioremap_nocache(AR5312_FLASHCTL_BASE,
+       flashctl_base = ioremap(AR5312_FLASHCTL_BASE,
                                        AR5312_FLASHCTL_SIZE);
 
        ctl = __raw_readl(flashctl_base + AR5312_FLASHCTL0);
@@ -358,7 +358,7 @@ void __init ar5312_plat_mem_setup(void)
        u32 devid;
 
        /* Detect memory size */
-       sdram_base = ioremap_nocache(AR5312_SDRAMCTL_BASE,
+       sdram_base = ioremap(AR5312_SDRAMCTL_BASE,
                                     AR5312_SDRAMCTL_SIZE);
        memcfg = __raw_readl(sdram_base + AR5312_MEM_CFG1);
        bank0_ac = ATH25_REG_MS(memcfg, AR5312_MEM_CFG1_AC0);
@@ -369,7 +369,7 @@ void __init ar5312_plat_mem_setup(void)
        add_memory_region(0, memsize, BOOT_MEM_RAM);
        iounmap(sdram_base);
 
-       ar5312_rst_base = ioremap_nocache(AR5312_RST_BASE, AR5312_RST_SIZE);
+       ar5312_rst_base = ioremap(AR5312_RST_BASE, AR5312_RST_SIZE);
 
        devid = ar5312_rst_reg_read(AR5312_REV);
        devid >>= AR5312_REV_WMAC_MIN_S;
index 989e710..cb99f97 100644 (file)
@@ -111,7 +111,7 @@ int __init ath25_find_config(phys_addr_t base, unsigned long size)
        u8 *mac_addr;
        u32 offset;
 
-       flash_base = ioremap_nocache(base, size);
+       flash_base = ioremap(base, size);
        flash_limit = flash_base + size;
 
        ath25_board.config = NULL;
index 63eacb8..137abbc 100644 (file)
@@ -41,7 +41,7 @@ static void __iomem *ath79_ddr_pci_win_base;
 
 void ath79_ddr_ctrl_init(void)
 {
-       ath79_ddr_base = ioremap_nocache(AR71XX_DDR_CTRL_BASE,
+       ath79_ddr_base = ioremap(AR71XX_DDR_CTRL_BASE,
                                         AR71XX_DDR_CTRL_SIZE);
        if (soc_is_ar913x() || soc_is_ar724x() || soc_is_ar933x()) {
                ath79_ddr_wb_flush_base = ath79_ddr_base + 0x7c;
index ea385a8..484ee28 100644 (file)
@@ -226,9 +226,9 @@ void __init plat_mem_setup(void)
        else if (fw_passed_dtb)
                __dt_setup_arch((void *)KSEG0ADDR(fw_passed_dtb));
 
-       ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
+       ath79_reset_base = ioremap(AR71XX_RESET_BASE,
                                           AR71XX_RESET_SIZE);
-       ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
+       ath79_pll_base = ioremap(AR71XX_PLL_BASE,
                                         AR71XX_PLL_SIZE);
        ath79_detect_sys_type();
        ath79_ddr_ctrl_init();
index 1f742c3..4f34d92 100644 (file)
@@ -357,7 +357,7 @@ static void octeon_write_lcd(const char *s)
 {
        if (octeon_bootinfo->led_display_base_addr) {
                void __iomem *lcd_address =
-                       ioremap_nocache(octeon_bootinfo->led_display_base_addr,
+                       ioremap(octeon_bootinfo->led_display_base_addr,
                                        8);
                int i;
                for (i = 0; i < 8; i++, s++) {
index 06d92fb..c238e95 100644 (file)
@@ -51,7 +51,7 @@ static void __init ocelot_earlyprintk_init(void)
 {
        void __iomem *uart_base;
 
-       uart_base = ioremap_nocache(UART_UART, 0x20);
+       uart_base = ioremap(UART_UART, 0x20);
        setup_8250_early_printk_port((unsigned long)uart_base, 2, 50000);
 }
 
index d9caa81..cf1f2a4 100644 (file)
@@ -227,7 +227,6 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset,
  */
 #define ioremap(offset, size)                                          \
        __ioremap_mode((offset), (size), _CACHE_UNCACHED)
-#define ioremap_nocache                ioremap
 #define ioremap_uc             ioremap
 
 /*
index e5ea3db..cdb93ed 100644 (file)
@@ -194,7 +194,7 @@ static void mips_cm_probe_l2sync(void)
        write_gcr_l2_only_sync_base(addr | CM_GCR_L2_ONLY_SYNC_BASE_SYNCEN);
 
        /* Map the region */
-       mips_cm_l2sync_base = ioremap_nocache(addr, MIPS_CM_L2SYNC_SIZE);
+       mips_cm_l2sync_base = ioremap(addr, MIPS_CM_L2SYNC_SIZE);
 }
 
 int mips_cm_probe(void)
@@ -215,7 +215,7 @@ int mips_cm_probe(void)
        if (!addr)
                return -ENODEV;
 
-       mips_gcr_base = ioremap_nocache(addr, MIPS_CM_GCR_SIZE);
+       mips_gcr_base = ioremap(addr, MIPS_CM_GCR_SIZE);
        if (!mips_gcr_base)
                return -ENXIO;
 
index 69e3e0b..8d25351 100644 (file)
@@ -78,7 +78,7 @@ int mips_cpc_probe(void)
        if (!addr)
                return -ENODEV;
 
-       mips_cpc_base = ioremap_nocache(addr, 0x8000);
+       mips_cpc_base = ioremap(addr, 0x8000);
        if (!mips_cpc_base)
                return -ENXIO;
 
index 037b08f..42222f8 100644 (file)
@@ -221,16 +221,16 @@ void __init ltq_soc_init(void)
                                res_sys[2].name) < 0))
                pr_err("Failed to request core resources");
 
-       status_membase = ioremap_nocache(res_status.start,
+       status_membase = ioremap(res_status.start,
                                        resource_size(&res_status));
-       ltq_ebu_membase = ioremap_nocache(res_ebu.start,
+       ltq_ebu_membase = ioremap(res_ebu.start,
                                        resource_size(&res_ebu));
 
        if (!status_membase || !ltq_ebu_membase)
                panic("Failed to remap core resources");
 
        for (i = 0; i < 3; i++) {
-               sysctl_membase[i] = ioremap_nocache(res_sys[i].start,
+               sysctl_membase[i] = ioremap(res_sys[i].start,
                                                resource_size(&res_sys[i]));
                if (!sysctl_membase[i])
                        panic("Failed to remap sysctrl resources");
index 115b417..df8eed3 100644 (file)
@@ -349,7 +349,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
                                        res.name))
                        pr_err("Failed to request icu%i memory\n", vpe);
 
-               ltq_icu_membase[vpe] = ioremap_nocache(res.start,
+               ltq_icu_membase[vpe] = ioremap(res.start,
                                        resource_size(&res));
 
                if (!ltq_icu_membase[vpe])
@@ -402,7 +402,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
                                                        res.name))
                        pr_err("Failed to request eiu memory");
 
-               ltq_eiu_membase = ioremap_nocache(res.start,
+               ltq_eiu_membase = ioremap(res.start,
                                                        resource_size(&res));
                if (!ltq_eiu_membase)
                        panic("Failed to remap eiu memory");
index 156a95a..aa37545 100644 (file)
@@ -431,10 +431,10 @@ void __init ltq_soc_init(void)
                                res_ebu.name))
                pr_err("Failed to request core resources");
 
-       pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu));
-       ltq_cgu_membase = ioremap_nocache(res_cgu.start,
+       pmu_membase = ioremap(res_pmu.start, resource_size(&res_pmu));
+       ltq_cgu_membase = ioremap(res_cgu.start,
                                                resource_size(&res_cgu));
-       ltq_ebu_membase = ioremap_nocache(res_ebu.start,
+       ltq_ebu_membase = ioremap(res_ebu.start,
                                                resource_size(&res_ebu));
        if (!pmu_membase || !ltq_cgu_membase || !ltq_ebu_membase)
                panic("Failed to remap core resources");
index e7c8716..e49c406 100644 (file)
 static inline void loongson_reboot(void)
 {
 #ifndef CONFIG_CPU_JUMP_WORKAROUNDS
-       ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();
+       ((void (*)(void))ioremap(LOONGSON_BOOT_BASE, 4)) ();
 #else
        void (*func)(void);
 
-       func = (void *)ioremap_nocache(LOONGSON_BOOT_BASE, 4);
+       func = (void *)ioremap(LOONGSON_BOOT_BASE, 4);
 
        __asm__ __volatile__(
        "       .set    noat                                            \n"
index 73dd251..fd76114 100644 (file)
@@ -26,13 +26,13 @@ void __init prom_init(void)
                memsize = DEFAULT_MEMSIZE;
 
        if (strstr(arcs_cmdline, "console=ttyS3"))
-               uart_base = ioremap_nocache(LS1X_UART3_BASE, 0x0f);
+               uart_base = ioremap(LS1X_UART3_BASE, 0x0f);
        else if (strstr(arcs_cmdline, "console=ttyS2"))
-               uart_base = ioremap_nocache(LS1X_UART2_BASE, 0x0f);
+               uart_base = ioremap(LS1X_UART2_BASE, 0x0f);
        else if (strstr(arcs_cmdline, "console=ttyS1"))
-               uart_base = ioremap_nocache(LS1X_UART1_BASE, 0x0f);
+               uart_base = ioremap(LS1X_UART1_BASE, 0x0f);
        else
-               uart_base = ioremap_nocache(LS1X_UART0_BASE, 0x0f);
+               uart_base = ioremap(LS1X_UART0_BASE, 0x0f);
        setup_8250_early_printk_port((unsigned long)uart_base, 0, 0);
 }
 
index 6c36a41..0c7399b 100644 (file)
@@ -37,7 +37,7 @@ static void ls1x_power_off(void)
 
 static int __init ls1x_reboot_setup(void)
 {
-       wdt_reg_base = ioremap_nocache(LS1X_WDT_BASE, (SZ_4 + SZ_8));
+       wdt_reg_base = ioremap(LS1X_WDT_BASE, (SZ_4 + SZ_8));
        if (!wdt_reg_base)
                panic("Failed to remap watchdog registers");
 
index f976620..4cc73f7 100644 (file)
@@ -49,7 +49,7 @@ static inline void ls1x_pwmtimer_restart(void)
 
 void __init ls1x_pwmtimer_init(void)
 {
-       timer_reg_base = ioremap_nocache(LS1X_TIMER_BASE, SZ_16);
+       timer_reg_base = ioremap(LS1X_TIMER_BASE, SZ_16);
        if (!timer_reg_base)
                panic("Failed to remap timer registers");
 
index 88b3bd5..bc76710 100644 (file)
@@ -17,7 +17,7 @@
 
 static inline void loongson_reboot(void)
 {
-       ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();
+       ((void (*)(void))ioremap(LOONGSON_BOOT_BASE, 4)) ();
 }
 
 static void loongson_restart(char *command)
index 98a0630..0ddf03d 100644 (file)
@@ -240,7 +240,7 @@ static void __init remove_gic(void *fdt)
                 * On systems using the RocIT system controller a GIC may be
                 * present without a CM. Detect whether that is the case.
                 */
-               biu_base = ioremap_nocache(MSC01_BIU_REG_BASE,
+               biu_base = ioremap(MSC01_BIU_REG_BASE,
                                MSC01_BIU_ADDRSPACE_SZ);
                sc_cfg = __raw_readl(biu_base + MSC01_SC_CFG_OFS);
                if (sc_cfg & MSC01_SC_CFG_GICPRES_MSK) {
index 4f2411f..01a2af8 100644 (file)
@@ -409,7 +409,7 @@ static int alchemy_pci_probe(struct platform_device *pdev)
                goto out6;
        }
 
-       ctx->regs = ioremap_nocache(r->start, resource_size(r));
+       ctx->regs = ioremap(r->start, resource_size(r));
        if (!ctx->regs) {
                dev_err(&pdev->dev, "cannot map pci regs\n");
                ret = -ENODEV;
index 0fed6fc..490953f 100644 (file)
@@ -441,7 +441,7 @@ static int ar2315_pci_probe(struct platform_device *pdev)
        apc->mem_res.flags = IORESOURCE_MEM;
 
        /* Remap PCI config space */
-       apc->cfg_mem = devm_ioremap_nocache(dev, res->start,
+       apc->cfg_mem = devm_ioremap(dev, res->start,
                                            AR2315_PCI_CFG_SIZE);
        if (!apc->cfg_mem) {
                dev_err(dev, "failed to remap PCI config space\n");
index 151d9b5..5548365 100644 (file)
@@ -221,7 +221,7 @@ static int __init bcm63xx_register_pci(void)
         * a spinlock for each io access, so this is currently kind of
         * broken on SMP.
         */
-       pci_iospace_start = ioremap_nocache(BCM_PCI_IO_BASE_PA, 4);
+       pci_iospace_start = ioremap(BCM_PCI_IO_BASE_PA, 4);
        if (!pci_iospace_start)
                return -ENOMEM;
 
index c9f4d4b..e1f12e3 100644 (file)
@@ -218,7 +218,7 @@ static int rt288x_pci_probe(struct platform_device *pdev)
 {
        void __iomem *io_map_base;
 
-       rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);
+       rt2880_pci_base = ioremap(RT2880_PCI_BASE, PAGE_SIZE);
 
        io_map_base = ioremap(RT2880_PCI_IO_BASE, RT2880_PCI_IO_SIZE);
        rt2880_pci_controller.io_map_base = (unsigned long) io_map_base;
index 8c23673..25372e6 100644 (file)
@@ -135,7 +135,7 @@ void __init fw_init_early_console(char port)
        char *arch_cmdline = pic32_getcmdline();
        int baud = -1;
 
-       uart_base = ioremap_nocache(PIC32_BASE_UART, 0xc00);
+       uart_base = ioremap(PIC32_BASE_UART, 0xc00);
 
        baud = get_baud_from_cmdline(arch_cmdline);
        if (port == -1)
index 504e6ab..f282263 100644 (file)
@@ -122,7 +122,7 @@ static const struct
 
 void pic32_pps_input(int function, int pin)
 {
-       void __iomem *pps_base = ioremap_nocache(PPS_BASE, 0xF4);
+       void __iomem *pps_base = ioremap(PPS_BASE, 0xF4);
        int i;
 
        for (i = 0; i < ARRAY_SIZE(input_pin_reg); i++) {
@@ -252,7 +252,7 @@ static const struct
 
 void pic32_pps_output(int function, int pin)
 {
-       void __iomem *pps_base = ioremap_nocache(PPS_BASE, 0x170);
+       void __iomem *pps_base = ioremap(PPS_BASE, 0x170);
        int i;
 
        for (i = 0; i < ARRAY_SIZE(output_pin_reg); i++) {
index 8e6e8db..940c684 100644 (file)
@@ -105,7 +105,7 @@ void __init msp_serial_setup(void)
 
        /* Initialize first serial port */
        up.mapbase      = MSP_UART0_BASE;
-       up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
+       up.membase      = ioremap(up.mapbase, MSP_UART_REG_LEN);
        up.irq          = MSP_INT_UART0;
        up.uartclk      = uartclk;
        up.regshift     = 2;
@@ -143,7 +143,7 @@ void __init msp_serial_setup(void)
        }
 
        up.mapbase      = MSP_UART1_BASE;
-       up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
+       up.membase      = ioremap(up.mapbase, MSP_UART_REG_LEN);
        up.irq          = MSP_INT_UART1;
        up.line         = 1;
        up.private_data         = (void*)UART1_STATUS_REG;
index c945d76..220ca0c 100644 (file)
@@ -165,7 +165,7 @@ static int __init intc_of_init(struct device_node *node,
                                res.name))
                pr_err("Failed to request intc memory");
 
-       rt_intc_membase = ioremap_nocache(res.start,
+       rt_intc_membase = ioremap(res.start,
                                        resource_size(&res));
        if (!rt_intc_membase)
                panic("Failed to remap intc memory");
index 59b2309..90c6d4a 100644 (file)
@@ -43,7 +43,7 @@ __iomem void *plat_of_remap_node(const char *node)
                                res.name))
                panic("Failed to request resources for %s", node);
 
-       return ioremap_nocache(res.start, resource_size(&res));
+       return ioremap(res.start, resource_size(&res));
 }
 
 void __init device_tree_init(void)
index c9ecf17..dd34f1b 100644 (file)
@@ -286,7 +286,7 @@ static int __init plat_setup_devices(void)
        nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
 
        /* Read and map device controller 3 */
-       dev3.base = ioremap_nocache(readl(IDT434_REG_BASE + DEV3BASE), 1);
+       dev3.base = ioremap(readl(IDT434_REG_BASE + DEV3BASE), 1);
 
        if (!dev3.base) {
                printk(KERN_ERR "rb532: cannot remap device controller 3\n");
index fdc704a..94f02ad 100644 (file)
@@ -192,7 +192,7 @@ int __init rb532_gpio_init(void)
        struct resource *r;
 
        r = rb532_gpio_reg0_res;
-       rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r));
+       rb532_gpio_chip->regbase = ioremap(r->start, resource_size(r));
 
        if (!rb532_gpio_chip->regbase) {
                printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");
index 26e957b..303cc3d 100644 (file)
@@ -110,7 +110,7 @@ void __init prom_init(void)
        phys_addr_t memsize;
        phys_addr_t ddrbase;
 
-       ddr = ioremap_nocache(ddr_reg[0].start,
+       ddr = ioremap(ddr_reg[0].start,
                        ddr_reg[0].end - ddr_reg[0].start);
 
        if (!ddr) {
index 1aa4df1..51af9d3 100644 (file)
@@ -49,7 +49,7 @@ void __init plat_mem_setup(void)
 
        set_io_port_base(KSEG1);
 
-       pci_reg = ioremap_nocache(pci0_res[0].start,
+       pci_reg = ioremap(pci0_res[0].start,
                                pci0_res[0].end - pci0_res[0].start);
        if (!pci_reg) {
                printk(KERN_ERR "Could not remap PCI registers\n");
index 160b880..f6fa9af 100644 (file)
@@ -399,10 +399,10 @@ void __init sni_rm200_i8259_irqs(void)
 {
        int i;
 
-       rm200_pic_master = ioremap_nocache(0x16000020, 4);
+       rm200_pic_master = ioremap(0x16000020, 4);
        if (!rm200_pic_master)
                return;
-       rm200_pic_slave = ioremap_nocache(0x160000a0, 4);
+       rm200_pic_slave = ioremap(0x160000a0, 4);
        if (!rm200_pic_slave) {
                iounmap(rm200_pic_master);
                return;
index 46212b5..cab8f64 100644 (file)
@@ -128,9 +128,8 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr)
  * The standard PCI ioremap interfaces
  */
 void __iomem *ioremap(unsigned long offset, unsigned long size);
-#define ioremap_nocache(off, sz)       ioremap((off), (sz))
-#define ioremap_wc                     ioremap_nocache
-#define ioremap_uc                     ioremap_nocache
+#define ioremap_wc                     ioremap
+#define ioremap_uc                     ioremap
 
 extern void iounmap(const volatile void __iomem *addr);
 
index 6766836..e1a8fee 100644 (file)
@@ -792,7 +792,7 @@ static int perf_write_image(uint64_t *memaddr)
                return -1;
        }
 
-       runway = ioremap_nocache(cpu_device->hpa.start, 4096);
+       runway = ioremap(cpu_device->hpa.start, 4096);
        if (!runway) {
                pr_err("perf_write_image: ioremap failed!\n");
                return -ENOMEM;
index a63ec93..635969b 100644 (file)
@@ -691,8 +691,6 @@ static inline void iosync(void)
  * * ioremap_prot allows to specify the page flags as an argument and can
  *   also be hooked by the platform via ppc_md.
  *
- * * ioremap_nocache is identical to ioremap
- *
  * * ioremap_wc enables write combining
  *
  * * ioremap_wt enables write through
@@ -715,7 +713,6 @@ extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size,
 extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);
 void __iomem *ioremap_wt(phys_addr_t address, unsigned long size);
 void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size);
-#define ioremap_nocache(addr, size)    ioremap((addr), (size))
 #define ioremap_uc(addr, size)         ioremap((addr), (size))
 #define ioremap_cache(addr, size) \
        ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL))
index d964c4d..77dad1e 100644 (file)
@@ -341,7 +341,7 @@ static void __init sh7785lcr_setup(char **cmdline_p)
        pm_power_off = sh7785lcr_power_off;
 
        /* sm501 DRAM configuration */
-       sm501_reg = ioremap_nocache(SM107_REG_ADDR, SM501_DRAM_CONTROL);
+       sm501_reg = ioremap(SM107_REG_ADDR, SM501_DRAM_CONTROL);
        if (!sm501_reg) {
                printk(KERN_ERR "%s: ioremap error.\n", __func__);
                return;
index 9108789..3b6ea2d 100644 (file)
@@ -137,7 +137,7 @@ void init_cayman_irq(void)
 {
        int i;
 
-       epld_virt = (unsigned long)ioremap_nocache(EPLD_BASE, 1024);
+       epld_virt = (unsigned long)ioremap(EPLD_BASE, 1024);
        if (!epld_virt) {
                printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n");
                return;
index 4cec147..8ef76e2 100644 (file)
@@ -99,7 +99,7 @@ static int __init smsc_superio_setup(void)
 {
        unsigned char devid, devrev;
 
-       smsc_superio_virt = (unsigned long)ioremap_nocache(SMSC_SUPERIO_BASE, 1024);
+       smsc_superio_virt = (unsigned long)ioremap(SMSC_SUPERIO_BASE, 1024);
        if (!smsc_superio_virt) {
                panic("Unable to remap SMSC SuperIO\n");
        }
index 895576f..a37e1e8 100644 (file)
@@ -32,7 +32,7 @@ static void __iomem *sdk7786_fpga_probe(void)
         * is reserved.
         */
        for (area = PA_AREA0; area < PA_AREA7; area += SZ_64M) {
-               base = ioremap_nocache(area + FPGA_REGS_OFFSET, FPGA_REGS_SIZE);
+               base = ioremap(area + FPGA_REGS_OFFSET, FPGA_REGS_SIZE);
                if (!base) {
                        /* Failed to remap this area, move along. */
                        continue;
index cf2fccc..24391b4 100644 (file)
@@ -96,7 +96,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
                        return -ENOMEM;
        }
 
-       hd->base = ioremap_nocache(res->start, resource_size(res));
+       hd->base = ioremap(res->start, resource_size(res));
        if (unlikely(!hd->base)) {
                dev_err(&pdev->dev, "ioremap failed\n");
 
index 49303fa..03225d2 100644 (file)
@@ -115,12 +115,12 @@ static int __init sh5pci_init(void)
                 return -EINVAL;
         }
 
-       pcicr_virt = (unsigned long)ioremap_nocache(SH5PCI_ICR_BASE, 1024);
+       pcicr_virt = (unsigned long)ioremap(SH5PCI_ICR_BASE, 1024);
        if (!pcicr_virt) {
                panic("Unable to remap PCICR\n");
        }
 
-       PCI_IO_AREA = (unsigned long)ioremap_nocache(SH5PCI_IO_BASE, 0x10000);
+       PCI_IO_AREA = (unsigned long)ioremap(SH5PCI_IO_BASE, 0x10000);
        if (!PCI_IO_AREA) {
                panic("Unable to remap PCIIO\n");
        }
index 1495489..39c9ead 100644 (file)
@@ -367,7 +367,6 @@ static inline void ioremap_fixed_init(void) { }
 static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
 #endif
 
-#define ioremap_nocache        ioremap
 #define ioremap_uc     ioremap
 
 /*
index 744f903..1b3050f 100644 (file)
@@ -124,7 +124,7 @@ void __init plat_irq_setup(void)
        unsigned long reg;
        int i;
 
-       intc_virt = (unsigned long)ioremap_nocache(INTC_BASE, 1024);
+       intc_virt = (unsigned long)ioremap(INTC_BASE, 1024);
        if (!intc_virt) {
                panic("Unable to remap INTC\n");
        }
index ae44dc2..d0d5d81 100644 (file)
@@ -88,8 +88,8 @@ static void j2_start_cpu(unsigned int cpu, unsigned long entry_point)
        if (!np) return;
 
        if (of_property_read_u32_array(np, "cpu-release-addr", regs, 2)) return;
-       release = ioremap_nocache(regs[0], sizeof(u32));
-       initpc = ioremap_nocache(regs[1], sizeof(u32));
+       release = ioremap(regs[0], sizeof(u32));
+       initpc = ioremap(regs[1], sizeof(u32));
 
        __raw_writel(entry_point, initpc);
        __raw_writel(1, release);
index 43763c2..dee6be2 100644 (file)
@@ -68,7 +68,7 @@ static struct sh_clk_ops *sh5_clk_ops[] = {
 
 void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)
 {
-       cprc_base = (unsigned long)ioremap_nocache(CPRC_BASE, 1024);
+       cprc_base = (unsigned long)ioremap(CPRC_BASE, 1024);
        BUG_ON(!cprc_base);
 
        if (idx < ARRAY_SIZE(sh5_clk_ops))
index eeb25a4..d481169 100644 (file)
@@ -28,7 +28,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
        arch_sync_dma_for_device(virt_to_phys(ret), size,
                        DMA_BIDIRECTIONAL);
 
-       ret_nocache = (void __force *)ioremap_nocache(virt_to_phys(ret), size);
+       ret_nocache = (void __force *)ioremap(virt_to_phys(ret), size);
        if (!ret_nocache) {
                free_pages((unsigned long)ret, order);
                return NULL;
index f4afa30..9bb27e5 100644 (file)
@@ -406,7 +406,6 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
        return (void __iomem *)offset;
 }
 
-#define ioremap_nocache(X,Y)           ioremap((X),(Y))
 #define ioremap_uc(X,Y)                        ioremap((X),(Y))
 #define ioremap_wc(X,Y)                        ioremap((X),(Y))
 #define ioremap_wt(X,Y)                        ioremap((X),(Y))
index 4b460e0..3ca74e1 100644 (file)
@@ -31,7 +31,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
  *
  */
 #define ioremap(cookie, size)          __uc32_ioremap(cookie, size)
-#define ioremap_nocache(cookie, size)  __uc32_ioremap(cookie, size)
 #define iounmap(cookie)                        __uc32_iounmap(cookie)
 
 #define readb_relaxed readb
index 5da106f..fe698f9 100644 (file)
@@ -95,7 +95,7 @@ static inline void apbt_set_mapping(void)
                printk(KERN_WARNING "No timer base from SFI, use default\n");
                apbt_address = APBT_DEFAULT_BASE;
        }
-       apbt_virt_address = ioremap_nocache(apbt_address, APBT_MMAP_SIZE);
+       apbt_virt_address = ioremap(apbt_address, APBT_MMAP_SIZE);
        if (!apbt_virt_address) {
                pr_debug("Failed mapping APBT phy address at %lu\n",\
                         (unsigned long)apbt_address);
index c6f791b..7a50f0b 100644 (file)
@@ -84,7 +84,7 @@ static inline void hpet_writel(unsigned int d, unsigned int a)
 
 static inline void hpet_set_mapping(void)
 {
-       hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
+       hpet_virt_address = ioremap(hpet_address, HPET_MMAP_SIZE);
 }
 
 static inline void hpet_clear_mapping(void)
index 1daf8f2..896d74c 100644 (file)
@@ -110,7 +110,7 @@ static void ich_force_enable_hpet(struct pci_dev *dev)
        }
 
        /* use bits 31:14, 16 kB aligned */
-       rcba_base = ioremap_nocache(rcba, 0x4000);
+       rcba_base = ioremap(rcba, 0x4000);
        if (rcba_base == NULL) {
                dev_printk(KERN_DEBUG, &dev->dev, "ioremap failed; "
                        "cannot force enable HPET\n");
index 4c61f07..b89f6ac 100644 (file)
@@ -354,7 +354,7 @@ static ssize_t tboot_log_read(struct file *file, char __user *user_buf, size_t c
        void *kbuf;
        int ret = -EFAULT;
 
-       log_base = ioremap_nocache(TBOOT_SERIAL_LOG_ADDR, TBOOT_SERIAL_LOG_SIZE);
+       log_base = ioremap(TBOOT_SERIAL_LOG_ADDR, TBOOT_SERIAL_LOG_SIZE);
        if (!log_base)
                return ret;
 
index 92153d0..bda73cb 100644 (file)
@@ -79,7 +79,7 @@ static void do_read_far_test(void __iomem *p)
 
 static void do_test(unsigned long size)
 {
-       void __iomem *p = ioremap_nocache(mmio_address, size);
+       void __iomem *p = ioremap(mmio_address, size);
        if (!p) {
                pr_err("could not ioremap, aborting.\n");
                return;
@@ -104,7 +104,7 @@ static void do_test_bulk_ioremapping(void)
        int i;
 
        for (i = 0; i < 10; ++i) {
-               p = ioremap_nocache(mmio_address, PAGE_SIZE);
+               p = ioremap(mmio_address, PAGE_SIZE);
                if (p)
                        iounmap(p);
        }
index 887d181..0c7b6e6 100644 (file)
@@ -105,7 +105,7 @@ static void __iomem *mcfg_ioremap(struct pci_mmcfg_region *cfg)
        start = cfg->address + PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
        num_buses = cfg->end_bus - cfg->start_bus + 1;
        size = PCI_MMCFG_BUS_OFFSET(num_buses);
-       addr = ioremap_nocache(start, size);
+       addr = ioremap(start, size);
        if (addr)
                addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
        return addr;
index 433376e..953437a 100644 (file)
@@ -104,7 +104,7 @@ static void lpit_update_residency(struct lpit_residency_info *info,
 
        info->gaddr = lpit_native->residency_counter;
        if (info->gaddr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
-               info->iomem_addr = ioremap_nocache(info->gaddr.address,
+               info->iomem_addr = ioremap(info->gaddr.address,
                                                   info->gaddr.bit_width / 8);
                if (!info->iomem_addr)
                        return;
index 135173c..391dff0 100644 (file)
@@ -824,7 +824,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
                quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;
 
        acdev->pbase = res->start;
-       acdev->vbase = devm_ioremap_nocache(&pdev->dev, res->start,
+       acdev->vbase = devm_ioremap(&pdev->dev, res->start,
                        resource_size(res));
        if (!acdev->vbase) {
                dev_warn(&pdev->dev, "ioremap fail\n");
index d3d851b..bd87476 100644 (file)
@@ -891,7 +891,7 @@ static int octeon_cf_probe(struct platform_device *pdev)
                                        of_node_put(dma_node);
                                        return -EINVAL;
                                }
-                               cf_port->dma_base = (u64)devm_ioremap_nocache(&pdev->dev, res_dma->start,
+                               cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
                                                                         resource_size(res_dma));
                                if (!cf_port->dma_base) {
                                        of_node_put(dma_node);
@@ -909,7 +909,7 @@ static int octeon_cf_probe(struct platform_device *pdev)
                if (!res_cs1)
                        return -EINVAL;
 
-               cs1 = devm_ioremap_nocache(&pdev->dev, res_cs1->start,
+               cs1 = devm_ioremap(&pdev->dev, res_cs1->start,
                                           resource_size(res_cs1));
                if (!cs1)
                        return rv;
@@ -925,7 +925,7 @@ static int octeon_cf_probe(struct platform_device *pdev)
        if (!res_cs0)
                return -EINVAL;
 
-       cs0 = devm_ioremap_nocache(&pdev->dev, res_cs0->start,
+       cs0 = devm_ioremap(&pdev->dev, res_cs0->start,
                                   resource_size(res_cs0));
        if (!cs0)
                return rv;
index deae466..479c4b2 100644 (file)
@@ -140,7 +140,7 @@ static int rb532_pata_driver_probe(struct platform_device *pdev)
        info->gpio_line = gpiod;
        info->irq = irq;
 
-       info->iobase = devm_ioremap_nocache(&pdev->dev, res->start,
+       info->iobase = devm_ioremap(&pdev->dev, res->start,
                                resource_size(res));
        if (!info->iobase)
                return -ENOMEM;
index b23d1e4..8fad56f 100644 (file)
 #include "suni.h"
 #include "eni.h"
 
-#if !defined(__i386__) && !defined(__x86_64__)
-#ifndef ioremap_nocache
-#define ioremap_nocache(X,Y) ioremap(X,Y)
-#endif 
-#endif
-
 /*
  * TODO:
  *
@@ -1725,7 +1719,7 @@ static int eni_do_init(struct atm_dev *dev)
        }
        printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d,base=0x%lx,irq=%d,",
            dev->number,pci_dev->revision,real_base,eni_dev->irq);
-       if (!(base = ioremap_nocache(real_base,MAP_MAX_SIZE))) {
+       if (!(base = ioremap(real_base,MAP_MAX_SIZE))) {
                printk("\n");
                printk(KERN_ERR DEV_LABEL "(itf %d): can't set up page "
                    "mapping\n",dev->number);
index 57f10b5..c153c96 100644 (file)
@@ -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;
 
index c42cec7..88a93c2 100644 (file)
@@ -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);
index c8073b5..90d5bdc 100644 (file)
@@ -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;
 
index 4a2d1b2..fd546c5 100644 (file)
@@ -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 {
index 1f3f9e0..4eaf97d 100644 (file)
@@ -827,7 +827,7 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                goto failed_req_csr;
        }
 
-       card->csr_remap = ioremap_nocache(csr_base, csr_len);
+       card->csr_remap = ioremap(csr_base, csr_len);
        if (!card->csr_remap) {
                dev_printk(KERN_ERR, &card->dev->dev,
                        "Unable to remap memory region\n");
index d9629fc..6ae48ad 100644 (file)
@@ -97,12 +97,12 @@ int __must_check fsl_create_mc_io(struct device *dev,
                return -EBUSY;
        }
 
-       mc_portal_virt_addr = devm_ioremap_nocache(dev,
+       mc_portal_virt_addr = devm_ioremap(dev,
                                                   mc_portal_phys_addr,
                                                   mc_portal_size);
        if (!mc_portal_virt_addr) {
                dev_err(dev,
-                       "devm_ioremap_nocache failed for MC portal %pa\n",
+                       "devm_ioremap failed for MC portal %pa\n",
                        &mc_portal_phys_addr);
                return -ENXIO;
        }
index ab154a7..9e84239 100644 (file)
@@ -941,7 +941,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
 
        bridge->gatt_table = (u32 __iomem *)table;
 #else
-       bridge->gatt_table = ioremap_nocache(virt_to_phys(table),
+       bridge->gatt_table = ioremap(virt_to_phys(table),
                                        (PAGE_SIZE * (1 << page_order)));
        bridge->driver->cache_flush();
 #endif
index c6271ce..66a62d1 100644 (file)
@@ -1087,7 +1087,7 @@ static void intel_i9xx_setup_flush(void)
        }
 
        if (intel_private.ifp_resource.start)
-               intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE);
+               intel_private.i9xx_flush_page = ioremap(intel_private.ifp_resource.start, PAGE_SIZE);
        if (!intel_private.i9xx_flush_page)
                dev_err(&intel_private.pcidev->dev,
                        "can't ioremap flush page - no chipset flushing\n");
index eb108b3..51121a4 100644 (file)
@@ -204,7 +204,7 @@ static int __init applicom_init(void)
                if (pci_enable_device(dev))
                        return -EIO;
 
-               RamIO = ioremap_nocache(pci_resource_start(dev, 0), LEN_RAM_IO);
+               RamIO = ioremap(pci_resource_start(dev, 0), LEN_RAM_IO);
 
                if (!RamIO) {
                        printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "
@@ -259,7 +259,7 @@ static int __init applicom_init(void)
        /* Now try the specified ISA cards */
 
        for (i = 0; i < MAX_ISA_BOARD; i++) {
-               RamIO = ioremap_nocache(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
+               RamIO = ioremap(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
 
                if (!RamIO) {
                        printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1);
index 290c880..9f205bd 100644 (file)
@@ -317,7 +317,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
                return -EBUSY;
        }
 
-       intel_rng_hw->mem = ioremap_nocache(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
+       intel_rng_hw->mem = ioremap(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
        if (intel_rng_hw->mem == NULL)
                return -EBUSY;
 
index 8c78aa0..7be8067 100644 (file)
@@ -81,13 +81,13 @@ static int octeon_rng_probe(struct platform_device *pdev)
                return -ENOENT;
 
 
-       rng->control_status = devm_ioremap_nocache(&pdev->dev,
+       rng->control_status = devm_ioremap(&pdev->dev,
                                                   res_ports->start,
                                                   sizeof(u64));
        if (!rng->control_status)
                return -ENOENT;
 
-       rng->result = devm_ioremap_nocache(&pdev->dev,
+       rng->result = devm_ioremap(&pdev->dev,
                                           res_result->start,
                                           sizeof(u64));
        if (!rng->result)
index fbc34be..7b703f1 100644 (file)
@@ -37,8 +37,8 @@ static u16 __init rz_cpg_read_mode_pins(void)
        void __iomem *ppr0, *pibc0;
        u16 modes;
 
-       ppr0 = ioremap_nocache(PPR0, 2);
-       pibc0 = ioremap_nocache(PIBC0, 2);
+       ppr0 = ioremap(PPR0, 2);
+       pibc0 = ioremap(PIBC0, 2);
        BUG_ON(!ppr0 || !pibc0);
        iowrite16(4, pibc0);    /* enable input buffer */
        modes = ioread16(ppr0);
index 9cde50c..12ac75f 100644 (file)
@@ -905,7 +905,7 @@ static int sh_cmt_map_memory(struct sh_cmt_device *cmt)
                return -ENXIO;
        }
 
-       cmt->mapbase = ioremap_nocache(mem->start, resource_size(mem));
+       cmt->mapbase = ioremap(mem->start, resource_size(mem));
        if (cmt->mapbase == NULL) {
                dev_err(&cmt->pdev->dev, "failed to remap I/O memory\n");
                return -ENXIO;
index 64526e5..bfccb31 100644 (file)
@@ -377,7 +377,7 @@ static int sh_mtu2_map_memory(struct sh_mtu2_device *mtu)
                return -ENXIO;
        }
 
-       mtu->mapbase = ioremap_nocache(res->start, resource_size(res));
+       mtu->mapbase = ioremap(res->start, resource_size(res));
        if (mtu->mapbase == NULL)
                return -ENXIO;
 
index d49690d..d41df9b 100644 (file)
@@ -486,7 +486,7 @@ static int sh_tmu_map_memory(struct sh_tmu_device *tmu)
                return -ENXIO;
        }
 
-       tmu->mapbase = ioremap_nocache(res->start, resource_size(res));
+       tmu->mapbase = ioremap(res->start, resource_size(res));
        if (tmu->mapbase == NULL)
                return -ENXIO;
 
index fdc767f..89d4fa8 100644 (file)
@@ -445,7 +445,7 @@ static int __init pcc_cpufreq_probe(void)
                goto out_free;
        }
 
-       pcch_virt_addr = ioremap_nocache(mem_resource->minimum,
+       pcch_virt_addr = ioremap(mem_resource->minimum,
                                        mem_resource->address_length);
        if (pcch_virt_addr == NULL) {
                pr_debug("probe: could not map shared mem region\n");
index 4e73238..3548364 100644 (file)
@@ -2507,7 +2507,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                addr = pci_resource_start(pdev, i);
                size = pci_resource_len(pdev, i);
 
-               dev->bar[i] = ioremap_nocache(addr, size);
+               dev->bar[i] = ioremap(addr, size);
                if (!dev->bar[i]) {
                        err = -ENOMEM;
                        goto err_out_unmap_bars;
index 832aefb..539e785 100644 (file)
@@ -772,10 +772,10 @@ static int request_and_map(struct platform_device *pdev, const char *name,
                return -EBUSY;
        }
 
-       *ptr = devm_ioremap_nocache(device, region->start,
+       *ptr = devm_ioremap(device, region->start,
                                    resource_size(region));
        if (*ptr == NULL) {
-               dev_err(device, "ioremap_nocache of %s failed!", name);
+               dev_err(device, "ioremap of %s failed!", name);
                return -ENOMEM;
        }
 
index f564a4a..5c1eea9 100644 (file)
@@ -324,7 +324,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
 
        pci_read_config_dword(pdev, I3000_MCHBAR, (u32 *) & mchbar);
        mchbar &= I3000_MCHBAR_MASK;
-       window = ioremap_nocache(mchbar, I3000_MMR_WINDOW_SIZE);
+       window = ioremap(mchbar, I3000_MMR_WINDOW_SIZE);
        if (!window) {
                printk(KERN_ERR "i3000: cannot map mmio space at 0x%lx\n",
                        mchbar);
index 432b375..a8988db 100644 (file)
@@ -280,7 +280,7 @@ static void __iomem *i3200_map_mchbar(struct pci_dev *pdev)
                return NULL;
        }
 
-       window = ioremap_nocache(u.mchbar, I3200_MMR_WINDOW_SIZE);
+       window = ioremap(u.mchbar, I3200_MMR_WINDOW_SIZE);
        if (!window)
                printk(KERN_ERR "i3200: cannot map mmio space at 0x%llx\n",
                        (unsigned long long)u.mchbar);
index 7c6a2d4..6be99e0 100644 (file)
@@ -485,7 +485,7 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
                goto fail0;
        }
        mchbar &= 0xffffc000;   /* bits 31:14 used for 16K window */
-       mch_window = ioremap_nocache(mchbar, 0x1000);
+       mch_window = ioremap(mchbar, 0x1000);
        if (!mch_window) {
                edac_dbg(3, "error ioremapping MCHBAR!\n");
                goto fail0;
index 4f65073..d68346a 100644 (file)
@@ -357,7 +357,7 @@ static void __iomem *ie31200_map_mchbar(struct pci_dev *pdev)
                return NULL;
        }
 
-       window = ioremap_nocache(u.mchbar, IE31200_MMR_WINDOW_SIZE);
+       window = ioremap(u.mchbar, IE31200_MMR_WINDOW_SIZE);
        if (!window)
                ie31200_printk(KERN_ERR, "Cannot map mmio space at 0x%llx\n",
                               (unsigned long long)u.mchbar);
index cc779f3..a65e2f7 100644 (file)
@@ -266,7 +266,7 @@ static void __iomem *x38_map_mchbar(struct pci_dev *pdev)
                return NULL;
        }
 
-       window = ioremap_nocache(u.mchbar, X38_MMR_WINDOW_SIZE);
+       window = ioremap(u.mchbar, X38_MMR_WINDOW_SIZE);
        if (!window)
                printk(KERN_ERR "x38: cannot map mmio space at 0x%llx\n",
                        (unsigned long long)u.mchbar);
index 0cc7466..6ca2f5a 100644 (file)
@@ -551,7 +551,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused)
        INIT_LIST_HEAD(&lynx->client_list);
        kref_init(&lynx->kref);
 
-       lynx->registers = ioremap_nocache(pci_resource_start(dev, 0),
+       lynx->registers = ioremap(pci_resource_start(dev, 0),
                                          PCILYNX_MAX_REGISTER);
        if (lynx->registers == NULL) {
                dev_err(&dev->dev, "Failed to map registers\n");
index da04fda..835ece9 100644 (file)
@@ -120,7 +120,7 @@ int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
        void __iomem *iobase;
        int err;
 
-       iobase = ioremap_nocache(base, lim);
+       iobase = ioremap(base, lim);
        if (!iobase)
                return -ENOMEM;
 
index afaf4be..9278bcf 100644 (file)
@@ -503,7 +503,7 @@ int psb_gtt_init(struct drm_device *dev, int resume)
         *      Map the GTT and the stolen memory area
         */
        if (!resume)
-               dev_priv->gtt_map = ioremap_nocache(pg->gtt_phys_start,
+               dev_priv->gtt_map = ioremap(pg->gtt_phys_start,
                                                gtt_pages << PAGE_SHIFT);
        if (!dev_priv->gtt_map) {
                dev_err(dev->dev, "Failure to map gtt.\n");
index 7005f8f..0900052 100644 (file)
@@ -256,7 +256,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
                                                            PSB_AUX_RESOURCE);
                        resource_len = pci_resource_len(dev_priv->aux_pdev,
                                                        PSB_AUX_RESOURCE);
-                       dev_priv->aux_reg = ioremap_nocache(resource_start,
+                       dev_priv->aux_reg = ioremap(resource_start,
                                                            resource_len);
                        if (!dev_priv->aux_reg)
                                goto out_err;
index 2fd4ca9..8dd5a43 100644 (file)
@@ -211,7 +211,7 @@ static int hibmc_hw_map(struct hibmc_drm_private *priv)
 
        ioaddr = pci_resource_start(pdev, 1);
        iosize = pci_resource_len(pdev, 1);
-       priv->mmio = devm_ioremap_nocache(dev->dev, ioaddr, iosize);
+       priv->mmio = devm_ioremap(dev->dev, ioaddr, iosize);
        if (!priv->mmio) {
                DRM_ERROR("Cannot map mmio region\n");
                return -ENOMEM;
index 6239a9a..f240648 100644 (file)
@@ -2847,7 +2847,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
         * readback check when writing GTT PTE entries.
         */
        if (IS_GEN9_LP(dev_priv) || INTEL_GEN(dev_priv) >= 10)
-               ggtt->gsm = ioremap_nocache(phys_addr, size);
+               ggtt->gsm = ioremap(phys_addr, size);
        else
                ggtt->gsm = ioremap_wc(phys_addr, size);
        if (!ggtt->gsm) {
index c84f0a8..ac678ac 100644 (file)
@@ -138,7 +138,7 @@ void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
 
        size = resource_size(res);
 
-       ptr = devm_ioremap_nocache(&pdev->dev, res->start, size);
+       ptr = devm_ioremap(&pdev->dev, res->start, size);
        if (!ptr) {
                DRM_DEV_ERROR(&pdev->dev, "failed to ioremap: %s\n", name);
                return ERR_PTR(-ENOMEM);
index 098bc9f..15bf8a2 100644 (file)
@@ -443,7 +443,7 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
                                           mem->bus.size);
                else
                        mem->bus.addr =
-                               ioremap_nocache(mem->bus.base + mem->bus.offset,
+                               ioremap(mem->bus.base + mem->bus.offset,
                                                mem->bus.size);
                if (!mem->bus.addr)
                        return -ENOMEM;
index 68289b0..68261c7 100644 (file)
@@ -534,7 +534,7 @@ static int sti_dvo_probe(struct platform_device *pdev)
                DRM_ERROR("Invalid dvo resource\n");
                return -ENOMEM;
        }
-       dvo->regs = devm_ioremap_nocache(dev, res->start,
+       dvo->regs = devm_ioremap(dev, res->start,
                        resource_size(res));
        if (!dvo->regs)
                return -ENOMEM;
index 8f7bf33..2bb3200 100644 (file)
@@ -759,14 +759,14 @@ static int sti_hda_probe(struct platform_device *pdev)
                DRM_ERROR("Invalid hda resource\n");
                return -ENOMEM;
        }
-       hda->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       hda->regs = devm_ioremap(dev, res->start, resource_size(res));
        if (!hda->regs)
                return -ENOMEM;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
                        "video-dacs-ctrl");
        if (res) {
-               hda->video_dacs_ctrl = devm_ioremap_nocache(dev, res->start,
+               hda->video_dacs_ctrl = devm_ioremap(dev, res->start,
                                resource_size(res));
                if (!hda->video_dacs_ctrl)
                        return -ENOMEM;
index 814560e..64ed102 100644 (file)
@@ -1393,7 +1393,7 @@ static int sti_hdmi_probe(struct platform_device *pdev)
                ret = -ENOMEM;
                goto release_adapter;
        }
-       hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       hdmi->regs = devm_ioremap(dev, res->start, resource_size(res));
        if (!hdmi->regs) {
                ret = -ENOMEM;
                goto release_adapter;
index 5767e93..c36a8da 100644 (file)
@@ -860,7 +860,7 @@ static int sti_tvout_probe(struct platform_device *pdev)
                DRM_ERROR("Invalid glue resource\n");
                return -ENOMEM;
        }
-       tvout->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       tvout->regs = devm_ioremap(dev, res->start, resource_size(res));
        if (!tvout->regs)
                return -ENOMEM;
 
index 0b17ac8..5e5f82b 100644 (file)
@@ -393,7 +393,7 @@ static int vtg_probe(struct platform_device *pdev)
                DRM_ERROR("Get memory resource failed\n");
                return -ENOMEM;
        }
-       vtg->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       vtg->regs = devm_ioremap(dev, res->start, resource_size(res));
        if (!vtg->regs) {
                DRM_ERROR("failed to remap I/O memory\n");
                return -ENOMEM;
index 2a9e675..a361236 100644 (file)
@@ -256,7 +256,7 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev)
                goto init_failed;
        }
 
-       priv->mmio = ioremap_nocache(res->start, resource_size(res));
+       priv->mmio = ioremap(res->start, resource_size(res));
        if (!priv->mmio) {
                dev_err(dev, "failed to ioremap\n");
                ret = -ENOMEM;
index 6b0883a..97fd1da 100644 (file)
@@ -218,7 +218,7 @@ static int ttm_mem_reg_ioremap(struct ttm_bo_device *bdev, struct ttm_mem_reg *m
                if (mem->placement & TTM_PL_FLAG_WC)
                        addr = ioremap_wc(mem->bus.base + mem->bus.offset, mem->bus.size);
                else
-                       addr = ioremap_nocache(mem->bus.base + mem->bus.offset, mem->bus.size);
+                       addr = ioremap(mem->bus.base + mem->bus.offset, mem->bus.size);
                if (!addr) {
                        (void) ttm_mem_io_lock(man, false);
                        ttm_mem_io_free(bdev, mem);
@@ -565,7 +565,7 @@ static int ttm_bo_ioremap(struct ttm_buffer_object *bo,
                        map->virtual = ioremap_wc(bo->mem.bus.base + bo->mem.bus.offset + offset,
                                                  size);
                else
-                       map->virtual = ioremap_nocache(bo->mem.bus.base + bo->mem.bus.offset + offset,
+                       map->virtual = ioremap(bo->mem.bus.base + bo->mem.bus.offset + offset,
                                                       size);
        }
        return (!map->virtual) ? -ENOMEM : 0;
index b09c39a..eeac4b0 100644 (file)
@@ -528,7 +528,7 @@ static int i5k_amb_probe(struct platform_device *pdev)
                goto err;
        }
 
-       data->amb_mmio = ioremap_nocache(data->amb_base, data->amb_len);
+       data->amb_mmio = ioremap(data->amb_base, data->amb_len);
        if (!data->amb_mmio) {
                res = -EBUSY;
                goto err_map_failed;
index ff340d7..abfe309 100644 (file)
@@ -369,7 +369,7 @@ static int highlander_i2c_probe(struct platform_device *pdev)
        if (unlikely(!dev))
                return -ENOMEM;
 
-       dev->base = ioremap_nocache(res->start, resource_size(res));
+       dev->base = ioremap(res->start, resource_size(res));
        if (unlikely(!dev->base)) {
                ret = -ENXIO;
                goto err;
index 0829cb6..4fde74e 100644 (file)
@@ -281,7 +281,7 @@ static int pmcmsptwi_probe(struct platform_device *pldev)
        }
 
        /* remap the memory */
-       pmcmsptwi_data.iobase = ioremap_nocache(res->start,
+       pmcmsptwi_data.iobase = ioremap(res->start,
                                                resource_size(res));
        if (!pmcmsptwi_data.iobase) {
                dev_err(&pldev->dev,
index 958c1ff..0441c7e 100644 (file)
@@ -442,7 +442,7 @@ int bnxt_qplib_enable_nq(struct pci_dev *pdev, struct bnxt_qplib_nq *nq,
                goto fail;
        }
        /* Unconditionally map 8 bytes to support 57500 series */
-       nq->bar_reg_iomem = ioremap_nocache(nq_base + nq->bar_reg_off, 8);
+       nq->bar_reg_iomem = ioremap(nq_base + nq->bar_reg_off, 8);
        if (!nq->bar_reg_iomem) {
                rc = -ENOMEM;
                goto fail;
index 5cdfa84..1291b12 100644 (file)
@@ -717,7 +717,7 @@ int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev,
        if (!res_base)
                return -ENOMEM;
 
-       rcfw->cmdq_bar_reg_iomem = ioremap_nocache(res_base +
+       rcfw->cmdq_bar_reg_iomem = ioremap(res_base +
                                              RCFW_COMM_BASE_OFFSET,
                                              RCFW_COMM_SIZE);
        if (!rcfw->cmdq_bar_reg_iomem) {
@@ -739,7 +739,7 @@ int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev,
                        "CREQ BAR region %d resc start is 0!\n",
                        rcfw->creq_bar_reg);
        /* Unconditionally map 8 bytes to support 57500 series */
-       rcfw->creq_bar_reg_iomem = ioremap_nocache(res_base + cp_bar_reg_off,
+       rcfw->creq_bar_reg_iomem = ioremap(res_base + cp_bar_reg_off,
                                                   8);
        if (!rcfw->creq_bar_reg_iomem) {
                dev_err(&rcfw->pdev->dev, "CREQ BAR region %d mapping failed\n",
index bdbde8e..60ea1b9 100644 (file)
@@ -704,7 +704,7 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res     *res,
                return -ENOMEM;
        }
 
-       dpit->dbr_bar_reg_iomem = ioremap_nocache(bar_reg_base + dbr_offset,
+       dpit->dbr_bar_reg_iomem = ioremap(bar_reg_base + dbr_offset,
                                                  dbr_len);
        if (!dpit->dbr_bar_reg_iomem) {
                dev_err(&res->pdev->dev,
index 61362bd..1a6268d 100644 (file)
@@ -161,7 +161,7 @@ int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev)
                return -EINVAL;
        }
 
-       dd->kregbase1 = ioremap_nocache(addr, RCV_ARRAY);
+       dd->kregbase1 = ioremap(addr, RCV_ARRAY);
        if (!dd->kregbase1) {
                dd_dev_err(dd, "UC mapping of kregbase1 failed\n");
                return -ENOMEM;
@@ -179,7 +179,7 @@ int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev)
        dd_dev_info(dd, "RcvArray count: %u\n", rcv_array_count);
        dd->base2_start  = RCV_ARRAY + rcv_array_count * 8;
 
-       dd->kregbase2 = ioremap_nocache(
+       dd->kregbase2 = ioremap(
                addr + dd->base2_start,
                TXE_PIO_SEND - dd->base2_start);
        if (!dd->kregbase2) {
index dd48433..91d64dd 100644 (file)
@@ -6630,7 +6630,7 @@ static int qib_init_7322_variables(struct qib_devdata *dd)
        /* vl15 buffers start just after the 4k buffers */
        vl15off = dd->physaddr + (dd->piobufbase >> 32) +
                  dd->piobcnt4k * dd->align4k;
-       dd->piovl15base = ioremap_nocache(vl15off,
+       dd->piovl15base = ioremap(vl15off,
                                          NUM_VL15_BUFS * dd->align4k);
        if (!dd->piovl15base) {
                ret = -ENOMEM;
index d4fd8a6..43c8ee1 100644 (file)
@@ -1759,7 +1759,7 @@ int init_chip_wc_pat(struct qib_devdata *dd, u32 vl15buflen)
                qib_userlen = dd->ureg_align * dd->cfgctxts;
 
        /* Sanity checks passed, now create the new mappings */
-       qib_kregbase = ioremap_nocache(qib_physaddr, qib_kreglen);
+       qib_kregbase = ioremap(qib_physaddr, qib_kreglen);
        if (!qib_kregbase)
                goto bail;
 
@@ -1768,7 +1768,7 @@ int init_chip_wc_pat(struct qib_devdata *dd, u32 vl15buflen)
                goto bail_kregbase;
 
        if (qib_userlen) {
-               qib_userbase = ioremap_nocache(qib_physaddr + dd->uregbase,
+               qib_userbase = ioremap(qib_physaddr + dd->uregbase,
                                               qib_userlen);
                if (!qib_userbase)
                        goto bail_piobase;
index 864f2af..3dc6ce0 100644 (file)
@@ -145,7 +145,7 @@ int qib_pcie_ddinit(struct qib_devdata *dd, struct pci_dev *pdev,
        addr = pci_resource_start(pdev, 0);
        len = pci_resource_len(pdev, 0);
 
-       dd->kregbase = ioremap_nocache(addr, len);
+       dd->kregbase = ioremap(addr, len);
        if (!dd->kregbase)
                return -ENOMEM;
 
index f741409..2fe9dcf 100644 (file)
@@ -107,7 +107,7 @@ static int pxa930_rotary_probe(struct platform_device *pdev)
        if (!r)
                return -ENOMEM;
 
-       r->mmio_base = ioremap_nocache(res->start, resource_size(res));
+       r->mmio_base = ioremap(res->start, resource_size(res));
        if (r->mmio_base == NULL) {
                dev_err(&pdev->dev, "failed to remap IO memory\n");
                err = -ENXIO;
index 27ad73f..c155ade 100644 (file)
@@ -195,7 +195,7 @@ static int sh_keysc_probe(struct platform_device *pdev)
        memcpy(&priv->pdata, dev_get_platdata(&pdev->dev), sizeof(priv->pdata));
        pdata = &priv->pdata;
 
-       priv->iomem_base = ioremap_nocache(res->start, resource_size(res));
+       priv->iomem_base = ioremap(res->start, resource_size(res));
        if (priv->iomem_base == NULL) {
                dev_err(&pdev->dev, "failed to remap I/O memory\n");
                error = -ENXIO;
index 41acde6..3332b77 100644 (file)
@@ -167,7 +167,7 @@ static int pxa930_trkball_probe(struct platform_device *pdev)
                goto failed;
        }
 
-       trkball->mmio_base = ioremap_nocache(res->start, resource_size(res));
+       trkball->mmio_base = ioremap(res->start, resource_size(res));
        if (!trkball->mmio_base) {
                dev_err(&pdev->dev, "failed to ioremap registers\n");
                error = -ENXIO;
index 96f9b53..2f9775d 100644 (file)
@@ -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);
index 568c523..27bde30 100644 (file)
@@ -440,7 +440,7 @@ static u8 __iomem * __init iommu_map_mmio_space(u64 address, u64 end)
                return NULL;
        }
 
-       return (u8 __iomem *)ioremap_nocache(address, end);
+       return (u8 __iomem *)ioremap(address, end);
 }
 
 static void __init iommu_unmap_mmio_space(struct amd_iommu *iommu)
index d246d74..23445eb 100644 (file)
@@ -298,7 +298,7 @@ static int tpci200_register(struct tpci200_board *tpci200)
 
        /* Map internal tpci200 driver user space */
        tpci200->info->interface_regs =
-               ioremap_nocache(pci_resource_start(tpci200->info->pdev,
+               ioremap(pci_resource_start(tpci200->info->pdev,
                                           TPCI200_IP_INTERFACE_BAR),
                        TPCI200_IFACE_SIZE);
        if (!tpci200->info->interface_regs) {
@@ -541,7 +541,7 @@ static int tpci200_pci_probe(struct pci_dev *pdev,
                ret = -EBUSY;
                goto out_err_pci_request;
        }
-       tpci200->info->cfg_regs = ioremap_nocache(
+       tpci200->info->cfg_regs = ioremap(
                        pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),
                        pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));
        if (!tpci200->info->cfg_regs) {
index 9c2a4b5..d480a51 100644 (file)
@@ -276,7 +276,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
        ipoctal->board_id = ipoctal->dev->id_device;
 
        region = &ipoctal->dev->region[IPACK_IO_SPACE];
-       addr = devm_ioremap_nocache(&ipoctal->dev->dev,
+       addr = devm_ioremap(&ipoctal->dev->dev,
                                    region->start, region->size);
        if (!addr) {
                dev_err(&ipoctal->dev->dev,
@@ -292,7 +292,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
 
        region = &ipoctal->dev->region[IPACK_INT_SPACE];
        ipoctal->int_space =
-               devm_ioremap_nocache(&ipoctal->dev->dev,
+               devm_ioremap(&ipoctal->dev->dev,
                                     region->start, region->size);
        if (!ipoctal->int_space) {
                dev_err(&ipoctal->dev->dev,
@@ -303,7 +303,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
 
        region = &ipoctal->dev->region[IPACK_MEM8_SPACE];
        ipoctal->mem8_space =
-               devm_ioremap_nocache(&ipoctal->dev->dev,
+               devm_ioremap(&ipoctal->dev->dev,
                                     region->start, 0x8000);
        if (!ipoctal->mem8_space) {
                dev_err(&ipoctal->dev->dev,
index f398546..d705071 100644 (file)
@@ -716,7 +716,7 @@ static int __init gic_of_init(struct device_node *node,
                __sync();
        }
 
-       mips_gic_base = ioremap_nocache(gic_base, gic_len);
+       mips_gic_base = ioremap(gic_base, gic_len);
 
        gicconfig = read_gic_config();
        gic_shared_intrs = gicconfig & GIC_CONFIG_NUMINTERRUPTS;
index f82bc60..6e5e317 100644 (file)
@@ -460,7 +460,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
                        goto err0;
                }
 
-               i->iomem = devm_ioremap_nocache(dev, io[k]->start,
+               i->iomem = devm_ioremap(dev, io[k]->start,
                                                resource_size(io[k]));
                if (!i->iomem) {
                        dev_err(dev, "failed to remap IOMEM\n");
index 04d51ca..4c8c96a 100644 (file)
@@ -105,7 +105,7 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr,
                        if (nums[i-1] + 1 != nums[i])
                                goto fail_map;
                buf->vaddr = (__force void *)
-                       ioremap_nocache(__pfn_to_phys(nums[0]), size + offset);
+                       ioremap(__pfn_to_phys(nums[0]), size + offset);
        } else {
                buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,
                                        PAGE_KERNEL);
index fd47bd0..2f1eeeb 100644 (file)
@@ -938,7 +938,7 @@ static int cx18_probe(struct pci_dev *pci_dev,
        /* map io memory */
        CX18_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
                   (u64)cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);
-       cx->enc_mem = ioremap_nocache(cx->base_addr + CX18_MEM_OFFSET,
+       cx->enc_mem = ioremap(cx->base_addr + CX18_MEM_OFFSET,
                                       CX18_MEM_SIZE);
        if (!cx->enc_mem) {
                CX18_ERR("ioremap failed. Can't get a window into CX23418 memory and register space\n");
index 3f3f40e..1f79700 100644 (file)
@@ -1042,7 +1042,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
        /* map io memory */
        IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
                   (u64)itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);
-       itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET,
+       itv->enc_mem = ioremap(itv->base_addr + IVTV_ENCODER_OFFSET,
                                       IVTV_ENCODER_SIZE);
        if (!itv->enc_mem) {
                IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 encoder memory\n");
@@ -1056,7 +1056,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
        if (itv->has_cx23415) {
                IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
                                (u64)itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
-               itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET,
+               itv->dec_mem = ioremap(itv->base_addr + IVTV_DECODER_OFFSET,
                                IVTV_DECODER_SIZE);
                if (!itv->dec_mem) {
                        IVTV_ERR("ioremap failed. Can't get a window into CX23415 decoder memory\n");
@@ -1075,7 +1075,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
        IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
                   (u64)itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
        itv->reg_mem =
-           ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
+           ioremap(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
        if (!itv->reg_mem) {
                IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 register space\n");
                IVTV_ERR("Each capture card with a CX23415/6 needs 64 kB of vmalloc address space for this window\n");
index f299baf..e06d113 100644 (file)
@@ -883,7 +883,7 @@ static int dm355_ccdc_probe(struct platform_device *pdev)
                goto fail_nores;
        }
 
-       ccdc_cfg.base_addr = ioremap_nocache(res->start, resource_size(res));
+       ccdc_cfg.base_addr = ioremap(res->start, resource_size(res));
        if (!ccdc_cfg.base_addr) {
                status = -ENOMEM;
                goto fail_nomem;
index 2fc6c9c..c6378c4 100644 (file)
@@ -817,7 +817,7 @@ static int dm644x_ccdc_probe(struct platform_device *pdev)
                goto fail_nores;
        }
 
-       ccdc_cfg.base_addr = ioremap_nocache(res->start, resource_size(res));
+       ccdc_cfg.base_addr = ioremap(res->start, resource_size(res));
        if (!ccdc_cfg.base_addr) {
                status = -ENOMEM;
                goto fail_nomem;
index e2e7ab7..b49378b 100644 (file)
@@ -1045,7 +1045,7 @@ static int isif_probe(struct platform_device *pdev)
                        status = -EBUSY;
                        goto fail_nobase_res;
                }
-               addr = ioremap_nocache(res->start, resource_size(res));
+               addr = ioremap(res->start, resource_size(res));
                if (!addr) {
                        status = -ENOMEM;
                        goto fail_base_iomap;
index a99caac..1ac0c70 100644 (file)
@@ -351,7 +351,7 @@ static int tegra_cec_probe(struct platform_device *pdev)
        if (cec->tegra_cec_irq <= 0)
                return -EBUSY;
 
-       cec->cec_base = devm_ioremap_nocache(&pdev->dev, res->start,
+       cec->cec_base = devm_ioremap(&pdev->dev, res->start,
                                             resource_size(res));
 
        if (!cec->cec_base) {
index fd7b216..06038b3 100644 (file)
@@ -1512,7 +1512,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
                bar = 1;
        len = pci_resource_len(pcidev, bar);
        base = pci_resource_start(pcidev, bar);
-       pcr->remap_addr = ioremap_nocache(base, len);
+       pcr->remap_addr = ioremap(base, len);
        if (!pcr->remap_addr) {
                ret = -ENOMEM;
                goto free_handle;
index c25fd40..fcd999f 100644 (file)
@@ -788,7 +788,7 @@ scif_node_add(struct scif_dev *scifdev, struct scifmsg *msg)
                        "failed to setup interrupts for %d\n", msg->src.node);
                goto interrupt_setup_error;
        }
-       newdev->mmio.va = ioremap_nocache(msg->payload[1], sdev->mmio->len);
+       newdev->mmio.va = ioremap(msg->payload[1], sdev->mmio->len);
        if (!newdev->mmio.va) {
                dev_err(&scifdev->sdev->dev,
                        "failed to map mmio for %d\n", msg->src.node);
index 359c5ba..063e441 100644 (file)
@@ -834,7 +834,7 @@ static int pti_pci_probe(struct pci_dev *pdev,
        }
        drv_data->aperture_base = drv_data->pti_addr+APERTURE_14;
        drv_data->pti_ioaddr =
-               ioremap_nocache((u32)drv_data->aperture_base,
+               ioremap((u32)drv_data->aperture_base,
                APERTURE_LEN);
        if (!drv_data->pti_ioaddr) {
                retval = -ENOMEM;
index 105e73d..674f9e0 100644 (file)
@@ -719,7 +719,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
                goto err_free;
        }
 
-       host->ioaddr = devm_ioremap_nocache(dev, iomem->start,
+       host->ioaddr = devm_ioremap(dev, iomem->start,
                                            resource_size(iomem));
        if (host->ioaddr == NULL) {
                err = -ENOMEM;
index f4ac064..e48bddd 100644 (file)
@@ -1106,7 +1106,7 @@ static int via_sd_probe(struct pci_dev *pcidev,
 
        len = pci_resource_len(pcidev, 0);
        base = pci_resource_start(pcidev, 0);
-       sdhost->mmiobase = ioremap_nocache(base, len);
+       sdhost->mmiobase = ioremap(base, len);
        if (!sdhost->mmiobase) {
                ret = -ENOMEM;
                goto free_mmc_host;
index eccf2e5..3af50db 100644 (file)
@@ -320,7 +320,7 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
         * ChipCommon revision.
         */
        if (b47s->bcma_cc->core->id.rev == 54)
-               b47s->window = ioremap_nocache(res->start, resource_size(res));
+               b47s->window = ioremap(res->start, resource_size(res));
        else
                b47s->window = ioremap_cache(res->start, resource_size(res));
        if (!b47s->window) {
index 462fadb..42a95ba 100644 (file)
@@ -163,7 +163,7 @@ static int amd76xrom_init_one(struct pci_dev *pdev,
        /* FIXME handle registers 0x80 - 0x8C the bios region locks */
 
        /* For write accesses caches are useless */
-       window->virt = ioremap_nocache(window->phys, window->size);
+       window->virt = ioremap(window->phys, window->size);
        if (!window->virt) {
                printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
                        window->phys, window->size);
index c9b7b4d..4604942 100644 (file)
@@ -191,7 +191,7 @@ static int __init ck804xrom_init_one(struct pci_dev *pdev,
        /* FIXME handle registers 0x80 - 0x8C the bios region locks */
 
        /* For write accesses caches are useless */
-       window->virt = ioremap_nocache(window->phys, window->size);
+       window->virt = ioremap(window->phys, window->size);
        if (!window->virt) {
                printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
                        window->phys, window->size);
index 5c27c69..85e1415 100644 (file)
@@ -249,7 +249,7 @@ static int __init esb2rom_init_one(struct pci_dev *pdev,
        }
 
        /* Map the firmware hub into my address space. */
-       window->virt = ioremap_nocache(window->phys, window->size);
+       window->virt = ioremap(window->phys, window->size);
        if (!window->virt) {
                printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
                        window->phys, window->size);
index 6b989f3..fda72c5 100644 (file)
@@ -184,7 +184,7 @@ static int __init ichxrom_init_one(struct pci_dev *pdev,
        }
 
        /* Map the firmware hub into my address space. */
-       window->virt = ioremap_nocache(window->phys, window->size);
+       window->virt = ioremap(window->phys, window->size);
        if (!window->virt) {
                printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
                        window->phys, window->size);
index 69503ae..d67b845 100644 (file)
@@ -133,7 +133,7 @@ static int vr_nor_init_maps(struct vr_nor_mtd *p)
        if (win_len < (CS0_START + CS0_SIZE))
                return -ENXIO;
 
-       p->csr_base = ioremap_nocache(csr_phys, csr_len);
+       p->csr_base = ioremap(csr_phys, csr_len);
        if (!p->csr_base)
                return -ENOMEM;
 
@@ -152,7 +152,7 @@ static int vr_nor_init_maps(struct vr_nor_mtd *p)
        p->map.bankwidth = (exp_timing_cs0 & TIMING_BYTE_EN) ? 1 : 2;
        p->map.phys = win_phys + CS0_START;
        p->map.size = CS0_SIZE;
-       p->map.virt = ioremap_nocache(p->map.phys, p->map.size);
+       p->map.virt = ioremap(p->map.phys, p->map.size);
        if (!p->map.virt) {
                err = -ENOMEM;
                goto release;
index 0eeadfe..832b880 100644 (file)
@@ -78,7 +78,7 @@ static int __init init_l440gx(void)
                return -ENODEV;
        }
 
-       l440gx_map.virt = ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
+       l440gx_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
        if (!l440gx_map.virt) {
                printk(KERN_WARNING "Failed to ioremap L440GX flash region\n");
index abc52b7..0bb6516 100644 (file)
@@ -82,10 +82,10 @@ static int __init init_netsc520(void)
        printk(KERN_NOTICE "NetSc520 flash device: 0x%Lx at 0x%Lx\n",
                        (unsigned long long)netsc520_map.size,
                        (unsigned long long)netsc520_map.phys);
-       netsc520_map.virt = ioremap_nocache(netsc520_map.phys, netsc520_map.size);
+       netsc520_map.virt = ioremap(netsc520_map.phys, netsc520_map.size);
 
        if (!netsc520_map.virt) {
-               printk("Failed to ioremap_nocache\n");
+               printk("Failed to ioremap\n");
                return -EIO;
        }
 
index 50046d4..7d34987 100644 (file)
@@ -176,7 +176,7 @@ static int __init nettel_init(void)
 #endif
        int rc = 0;
 
-       nettel_mmcrp = (void *) ioremap_nocache(0xfffef000, 4096);
+       nettel_mmcrp = (void *) ioremap(0xfffef000, 4096);
        if (nettel_mmcrp == NULL) {
                printk("SNAPGEAR: failed to disable MMCR cache??\n");
                return(-EIO);
@@ -217,7 +217,7 @@ static int __init nettel_init(void)
        __asm__ ("wbinvd");
 
        nettel_amd_map.phys = amdaddr;
-       nettel_amd_map.virt = ioremap_nocache(amdaddr, maxsize);
+       nettel_amd_map.virt = ioremap(amdaddr, maxsize);
        if (!nettel_amd_map.virt) {
                printk("SNAPGEAR: failed to ioremap() BOOTCS\n");
                iounmap(nettel_mmcrp);
@@ -303,7 +303,7 @@ static int __init nettel_init(void)
        /* Probe for the size of the first Intel flash */
        nettel_intel_map.size = maxsize;
        nettel_intel_map.phys = intel0addr;
-       nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize);
+       nettel_intel_map.virt = ioremap(intel0addr, maxsize);
        if (!nettel_intel_map.virt) {
                printk("SNAPGEAR: failed to ioremap() ROMCS1\n");
                rc = -EIO;
@@ -337,7 +337,7 @@ static int __init nettel_init(void)
        iounmap(nettel_intel_map.virt);
 
        nettel_intel_map.size = maxsize;
-       nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize);
+       nettel_intel_map.virt = ioremap(intel0addr, maxsize);
        if (!nettel_intel_map.virt) {
                printk("SNAPGEAR: failed to ioremap() ROMCS1/2\n");
                rc = -EIO;
index 9a49f8a..377ef0f 100644 (file)
@@ -94,7 +94,7 @@ intel_iq80310_init(struct pci_dev *dev, struct map_pci_info *map)
        map->map.write = mtd_pci_write8,
 
        map->map.size     = 0x00800000;
-       map->base         = ioremap_nocache(pci_resource_start(dev, 0),
+       map->base         = ioremap(pci_resource_start(dev, 0),
                                            pci_resource_len(dev, 0));
 
        if (!map->base)
@@ -188,7 +188,7 @@ intel_dc21285_init(struct pci_dev *dev, struct map_pci_info *map)
        map->map.read = mtd_pci_read32,
        map->map.write = mtd_pci_write32,
        map->map.size     = len;
-       map->base         = ioremap_nocache(base, len);
+       map->base         = ioremap(base, len);
 
        if (!map->base)
                return -ENOMEM;
index 03af2df..9902b37 100644 (file)
@@ -174,8 +174,8 @@ static void sc520cdp_setup_par(void)
        int i, j;
 
        /* map in SC520's MMCR area */
-       mmcr = ioremap_nocache(SC520_MMCR_BASE, SC520_MMCR_EXTENT);
-       if(!mmcr) { /* ioremap_nocache failed: skip the PAR reprogramming */
+       mmcr = ioremap(SC520_MMCR_BASE, SC520_MMCR_EXTENT);
+       if(!mmcr) { /* ioremap failed: skip the PAR reprogramming */
                /* force physical address fields to BIOS defaults: */
                for(i = 0; i < NUM_FLASH_BANKS; i++)
                        sc520cdp_map[i].phys = par_table[i].default_address;
@@ -225,10 +225,10 @@ static int __init init_sc520cdp(void)
                        (unsigned long long)sc520cdp_map[i].size,
                        (unsigned long long)sc520cdp_map[i].phys);
 
-               sc520cdp_map[i].virt = ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);
+               sc520cdp_map[i].virt = ioremap(sc520cdp_map[i].phys, sc520cdp_map[i].size);
 
                if (!sc520cdp_map[i].virt) {
-                       printk("Failed to ioremap_nocache\n");
+                       printk("Failed to ioremap\n");
                        for (j = 0; j < i; j++) {
                                if (mymtd[j]) {
                                        map_destroy(mymtd[j]);
index 2afb253..57303f9 100644 (file)
@@ -152,7 +152,7 @@ static int scb2_flash_probe(struct pci_dev *dev,
        }
 
        /* remap the IO window (w/o caching) */
-       scb2_ioaddr = ioremap_nocache(SCB2_ADDR, SCB2_WINDOW);
+       scb2_ioaddr = ioremap(SCB2_ADDR, SCB2_WINDOW);
        if (!scb2_ioaddr) {
                printk(KERN_ERR MODNAME ": Failed to ioremap window!\n");
                if (!region_fail)
index 6cfc878..70d6e86 100644 (file)
@@ -56,10 +56,10 @@ static int __init init_ts5500_map(void)
 {
        int rc = 0;
 
-       ts5500_map.virt = ioremap_nocache(ts5500_map.phys, ts5500_map.size);
+       ts5500_map.virt = ioremap(ts5500_map.phys, ts5500_map.size);
 
        if (!ts5500_map.virt) {
-               printk(KERN_ERR "Failed to ioremap_nocache\n");
+               printk(KERN_ERR "Failed to ioremap\n");
                rc = -EIO;
                goto err2;
        }
index e10b760..75eb3e9 100644 (file)
@@ -404,7 +404,7 @@ static int au1550nd_probe(struct platform_device *pdev)
                goto out1;
        }
 
-       ctx->base = ioremap_nocache(r->start, 0x1000);
+       ctx->base = ioremap(r->start, 0x1000);
        if (!ctx->base) {
                dev_err(&pdev->dev, "cannot remap NAND memory area\n");
                ret = -ENODEV;
index d62aa52..2f77ee5 100644 (file)
@@ -74,15 +74,15 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                return ret;
        }
 
-       denali->reg = ioremap_nocache(csr_base, csr_len);
+       denali->reg = ioremap(csr_base, csr_len);
        if (!denali->reg) {
                dev_err(&dev->dev, "Spectra: Unable to remap memory region\n");
                return -ENOMEM;
        }
 
-       denali->host = ioremap_nocache(mem_base, mem_len);
+       denali->host = ioremap(mem_base, mem_len);
        if (!denali->host) {
-               dev_err(&dev->dev, "Spectra: ioremap_nocache failed!");
+               dev_err(&dev->dev, "Spectra: ioremap failed!");
                ret = -ENOMEM;
                goto out_unmap_reg;
        }
index 1054cc0..f31fae3 100644 (file)
@@ -285,7 +285,7 @@ static int fun_probe(struct platform_device *ofdev)
                fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |
                                  FSL_UPM_WAIT_WRITE_BYTE;
 
-       fun->io_base = devm_ioremap_nocache(&ofdev->dev, io_res.start,
+       fun->io_base = devm_ioremap(&ofdev->dev, io_res.start,
                                            resource_size(&io_res));
        if (!fun->io_base) {
                ret = -ENOMEM;
index c8e1a04..9df2007 100644 (file)
@@ -1302,7 +1302,7 @@ static int at91_can_probe(struct platform_device *pdev)
                goto exit_put;
        }
 
-       addr = ioremap_nocache(res->start, resource_size(res));
+       addr = ioremap(res->start, resource_size(res));
        if (!addr) {
                err = -ENOMEM;
                goto exit_release;
index b9047d8..194c86e 100644 (file)
@@ -175,7 +175,7 @@ static int cc770_isa_probe(struct platform_device *pdev)
                        err = -EBUSY;
                        goto exit;
                }
-               base = ioremap_nocache(mem[idx], iosize);
+               base = ioremap(mem[idx], iosize);
                if (!base) {
                        err = -ENOMEM;
                        goto exit_release;
index 1c4d32d..d513fac 100644 (file)
@@ -130,7 +130,7 @@ static int sja1000_isa_probe(struct platform_device *pdev)
                        err = -EBUSY;
                        goto exit;
                }
-               base = ioremap_nocache(mem[idx], iosize);
+               base = ioremap(mem[idx], iosize);
                if (!base) {
                        err = -ENOMEM;
                        goto exit_release;
index ff5a96f..d7222ba 100644 (file)
@@ -229,7 +229,7 @@ static int sp_probe(struct platform_device *pdev)
                                     resource_size(res_mem), DRV_NAME))
                return -EBUSY;
 
-       addr = devm_ioremap_nocache(&pdev->dev, res_mem->start,
+       addr = devm_ioremap(&pdev->dev, res_mem->start,
                                    resource_size(res_mem));
        if (!addr)
                return -ENOMEM;
index 8242fb2..d1ddf76 100644 (file)
@@ -777,7 +777,7 @@ static int softing_pdev_probe(struct platform_device *pdev)
                goto platform_resource_failed;
        card->dpram_phys = pres->start;
        card->dpram_size = resource_size(pres);
-       card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);
+       card->dpram = ioremap(card->dpram_phys, card->dpram_size);
        if (!card->dpram) {
                dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
                goto ioremap_failed;
index 80ef3e1..9daef4c 100644 (file)
@@ -1791,7 +1791,7 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        sdev->is_fiber = slic_is_fiber(pdev->subsystem_device);
        sdev->pdev = pdev;
        sdev->netdev = dev;
-       sdev->regs = ioremap_nocache(pci_resource_start(pdev, 0),
+       sdev->regs = ioremap(pci_resource_start(pdev, 0),
                                     pci_resource_len(pdev, 0));
        if (!sdev->regs) {
                dev_err(&pdev->dev, "failed to map registers\n");
index 4cd53fc..1671c1f 100644 (file)
@@ -1332,10 +1332,10 @@ static int request_and_map(struct platform_device *pdev, const char *name,
                return -EBUSY;
        }
 
-       *ptr = devm_ioremap_nocache(device, region->start,
+       *ptr = devm_ioremap(device, region->start,
                                    resource_size(region));
        if (*ptr == NULL) {
-               dev_err(device, "ioremap_nocache of %s failed!", name);
+               dev_err(device, "ioremap of %s failed!", name);
                return -ENOMEM;
        }
 
index 1793950..307e402 100644 (file)
@@ -1161,7 +1161,7 @@ static int au1000_probe(struct platform_device *pdev)
 
        /* aup->mac is the base address of the MAC's registers */
        aup->mac = (struct mac_reg *)
-                       ioremap_nocache(base->start, resource_size(base));
+                       ioremap(base->start, resource_size(base));
        if (!aup->mac) {
                dev_err(&pdev->dev, "failed to ioremap MAC registers\n");
                err = -ENXIO;
@@ -1169,7 +1169,7 @@ static int au1000_probe(struct platform_device *pdev)
        }
 
        /* Setup some variables for quick register address access */
-       aup->enable = (u32 *)ioremap_nocache(macen->start,
+       aup->enable = (u32 *)ioremap(macen->start,
                                                resource_size(macen));
        if (!aup->enable) {
                dev_err(&pdev->dev, "failed to ioremap MAC enable register\n");
@@ -1178,7 +1178,7 @@ static int au1000_probe(struct platform_device *pdev)
        }
        aup->mac_id = pdev->id;
 
-       aup->macdma = ioremap_nocache(macdma->start, resource_size(macdma));
+       aup->macdma = ioremap(macdma->start, resource_size(macdma));
        if (!aup->macdma) {
                dev_err(&pdev->dev, "failed to ioremap MACDMA registers\n");
                err = -ENXIO;
index 2bb3296..6b27af0 100644 (file)
@@ -253,7 +253,7 @@ static int aq_pci_probe(struct pci_dev *pdev,
                                goto err_free_aq_hw;
                        }
 
-                       self->aq_hw->mmio = ioremap_nocache(mmio_pa, reg_sz);
+                       self->aq_hw->mmio = ioremap(mmio_pa, reg_sz);
                        if (!self->aq_hw->mmio) {
                                err = -EIO;
                                goto err_free_aq_hw;
index 61a334d..60ba69d 100644 (file)
@@ -1687,8 +1687,7 @@ static int ag71xx_probe(struct platform_device *pdev)
                goto err_free;
        }
 
-       ag->mac_base = devm_ioremap_nocache(&pdev->dev, res->start,
-                                           resource_size(res));
+       ag->mac_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (!ag->mac_base) {
                err = -ENOMEM;
                goto err_free;
index cff64e4..61fa32c 100644 (file)
@@ -14053,7 +14053,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
                        rc = -ENOMEM;
                        goto init_one_freemem;
                }
-               bp->doorbells = ioremap_nocache(pci_resource_start(pdev, 2),
+               bp->doorbells = ioremap(pci_resource_start(pdev, 2),
                                                doorbell_size);
        }
        if (!bp->doorbells) {
index 1604ad3..f991537 100644 (file)
@@ -2537,7 +2537,7 @@ static int sbmac_probe(struct platform_device *pldev)
 
        res = platform_get_resource(pldev, IORESOURCE_MEM, 0);
        BUG_ON(!res);
-       sbm_base = ioremap_nocache(res->start, resource_size(res));
+       sbm_base = ioremap(res->start, resource_size(res));
        if (!sbm_base) {
                printk(KERN_ERR "%s: unable to map device registers\n",
                       dev_name(&pldev->dev));
index e338272..01a50a4 100644 (file)
@@ -3477,7 +3477,7 @@ bnad_init(struct bnad *bnad,
        bnad->pcidev = pdev;
        bnad->mmio_start = pci_resource_start(pdev, 0);
        bnad->mmio_len = pci_resource_len(pdev, 0);
-       bnad->bar0 = ioremap_nocache(bnad->mmio_start, bnad->mmio_len);
+       bnad->bar0 = ioremap(bnad->mmio_start, bnad->mmio_len);
        if (!bnad->bar0) {
                dev_err(&pdev->dev, "ioremap for bar0 failed\n");
                return -ENOMEM;
index 58f89f6..2824b5e 100644 (file)
@@ -3265,7 +3265,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_free_adapter;
        }
 
-       adapter->regs = ioremap_nocache(mmio_start, mmio_len);
+       adapter->regs = ioremap(mmio_start, mmio_len);
        if (!adapter->regs) {
                dev_err(&pdev->dev, "cannot map device registers\n");
                err = -ENOMEM;
index f1a2da1..7852a43 100644 (file)
@@ -2039,7 +2039,7 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        /* remap CSR registers */
-       regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
+       regs = ioremap(pciaddr, DE_REGS_SIZE);
        if (!regs) {
                rc = -EIO;
                pr_err("Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
index ea4f17f..c6e74ae 100644 (file)
@@ -1087,7 +1087,7 @@ static int ethoc_probe(struct platform_device *pdev)
        priv = netdev_priv(netdev);
        priv->netdev = netdev;
 
-       priv->iobase = devm_ioremap_nocache(&pdev->dev, netdev->base_addr,
+       priv->iobase = devm_ioremap(&pdev->dev, netdev->base_addr,
                        resource_size(mmio));
        if (!priv->iobase) {
                dev_err(&pdev->dev, "cannot remap I/O memory space\n");
@@ -1096,7 +1096,7 @@ static int ethoc_probe(struct platform_device *pdev)
        }
 
        if (netdev->mem_end) {
-               priv->membase = devm_ioremap_nocache(&pdev->dev,
+               priv->membase = devm_ioremap(&pdev->dev,
                        netdev->mem_start, resource_size(mem));
                if (!priv->membase) {
                        dev_err(&pdev->dev, "cannot remap memory space\n");
index 6436a98..22f5887 100644 (file)
@@ -91,10 +91,10 @@ static int sni_82596_probe(struct platform_device *dev)
        idprom = platform_get_resource(dev, IORESOURCE_MEM, 2);
        if (!res || !ca || !options || !idprom)
                return -ENODEV;
-       mpu_addr = ioremap_nocache(res->start, 4);
+       mpu_addr = ioremap(res->start, 4);
        if (!mpu_addr)
                return -ENOMEM;
-       ca_addr = ioremap_nocache(ca->start, 4);
+       ca_addr = ioremap(ca->start, 4);
        if (!ca_addr)
                goto probe_failed_free_mpu;
 
@@ -110,7 +110,7 @@ static int sni_82596_probe(struct platform_device *dev)
        netdevice->base_addr = res->start;
        netdevice->irq = platform_get_irq(dev, 0);
 
-       eth_addr = ioremap_nocache(idprom->start, 0x10);
+       eth_addr = ioremap(idprom->start, 0x10);
        if (!eth_addr)
                goto probe_failed;
 
index ae195f8..d316453 100644 (file)
@@ -1043,7 +1043,7 @@ static int korina_probe(struct platform_device *pdev)
 
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
        dev->base_addr = r->start;
-       lp->eth_regs = ioremap_nocache(r->start, resource_size(r));
+       lp->eth_regs = ioremap(r->start, resource_size(r));
        if (!lp->eth_regs) {
                printk(KERN_ERR DRV_NAME ": cannot remap registers\n");
                rc = -ENXIO;
@@ -1051,7 +1051,7 @@ static int korina_probe(struct platform_device *pdev)
        }
 
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");
-       lp->rx_dma_regs = ioremap_nocache(r->start, resource_size(r));
+       lp->rx_dma_regs = ioremap(r->start, resource_size(r));
        if (!lp->rx_dma_regs) {
                printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");
                rc = -ENXIO;
@@ -1059,7 +1059,7 @@ static int korina_probe(struct platform_device *pdev)
        }
 
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");
-       lp->tx_dma_regs = ioremap_nocache(r->start, resource_size(r));
+       lp->tx_dma_regs = ioremap(r->start, resource_size(r));
        if (!lp->tx_dma_regs) {
                printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");
                rc = -ENXIO;
index 6e73ffe..41f2f54 100644 (file)
@@ -649,7 +649,7 @@ ltq_etop_probe(struct platform_device *pdev)
                goto err_out;
        }
 
-       ltq_etop_membase = devm_ioremap_nocache(&pdev->dev,
+       ltq_etop_membase = devm_ioremap(&pdev->dev,
                res->start, resource_size(res));
        if (!ltq_etop_membase) {
                dev_err(&pdev->dev, "failed to remap etop engine %d\n",
index 095f6c7..7515d07 100644 (file)
@@ -3932,7 +3932,7 @@ static int skge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        spin_lock_init(&hw->phy_lock);
        tasklet_init(&hw->phy_task, skge_extirq, (unsigned long) hw);
 
-       hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
+       hw->regs = ioremap(pci_resource_start(pdev, 0), 0x4000);
        if (!hw->regs) {
                dev_err(&pdev->dev, "cannot map device registers\n");
                goto err_out_free_hw;
index 5f56ee8..535dee3 100644 (file)
@@ -5022,7 +5022,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw->pdev = pdev;
        sprintf(hw->irq_name, DRV_NAME "@pci:%s", pci_name(pdev));
 
-       hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
+       hw->regs = ioremap(pci_resource_start(pdev, 0), 0x4000);
        if (!hw->regs) {
                dev_err(&pdev->dev, "cannot map device registers\n");
                goto err_out_free_hw;
index 6af9a7e..0912540 100644 (file)
@@ -1937,7 +1937,7 @@ static int ns83820_init_one(struct pci_dev *pci_dev,
 
        pci_set_master(pci_dev);
        addr = pci_resource_start(pci_dev, 1);
-       dev->base = ioremap_nocache(addr, PAGE_SIZE);
+       dev->base = ioremap(addr, PAGE_SIZE);
        dev->tx_descs = pci_alloc_consistent(pci_dev,
                        4 * DESC_SIZE * NR_TX_DESC, &dev->tx_phy_descs);
        dev->rx_info.descs = pci_alloc_consistent(pci_dev,
index e4977cd..c0e2f43 100644 (file)
@@ -106,7 +106,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
         * first NFP_NET_CFG_BAR_SZ of the BAR.  This keeps the code
         * the identical for PF and VF drivers.
         */
-       ctrl_bar = ioremap_nocache(pci_resource_start(pdev, NFP_NET_CTRL_BAR),
+       ctrl_bar = ioremap(pci_resource_start(pdev, NFP_NET_CTRL_BAR),
                                   NFP_NET_CFG_BAR_SZ);
        if (!ctrl_bar) {
                dev_err(&pdev->dev,
@@ -200,7 +200,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
                        bar_sz = (rx_bar_off + rx_bar_sz) - bar_off;
 
                map_addr = pci_resource_start(pdev, tx_bar_no) + bar_off;
-               vf->q_bar = ioremap_nocache(map_addr, bar_sz);
+               vf->q_bar = ioremap(map_addr, bar_sz);
                if (!vf->q_bar) {
                        nn_err(nn, "Failed to map resource %d\n", tx_bar_no);
                        err = -EIO;
@@ -216,7 +216,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
 
                /* TX queues */
                map_addr = pci_resource_start(pdev, tx_bar_no) + tx_bar_off;
-               nn->tx_bar = ioremap_nocache(map_addr, tx_bar_sz);
+               nn->tx_bar = ioremap(map_addr, tx_bar_sz);
                if (!nn->tx_bar) {
                        nn_err(nn, "Failed to map resource %d\n", tx_bar_no);
                        err = -EIO;
@@ -225,7 +225,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
 
                /* RX queues */
                map_addr = pci_resource_start(pdev, rx_bar_no) + rx_bar_off;
-               nn->rx_bar = ioremap_nocache(map_addr, rx_bar_sz);
+               nn->rx_bar = ioremap(map_addr, rx_bar_sz);
                if (!nn->rx_bar) {
                        nn_err(nn, "Failed to map resource %d\n", rx_bar_no);
                        err = -EIO;
index 85d46f2..b454db2 100644 (file)
@@ -611,7 +611,7 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
        /* Configure, and lock, BAR0.0 for General Target use (MSI-X SRAM) */
        bar = &nfp->bar[0];
        if (nfp_bar_resource_len(bar) >= NFP_PCI_MIN_MAP_SIZE)
-               bar->iomem = ioremap_nocache(nfp_bar_resource_start(bar),
+               bar->iomem = ioremap(nfp_bar_resource_start(bar),
                                             nfp_bar_resource_len(bar));
        if (bar->iomem) {
                int pf;
@@ -677,7 +677,7 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
                }
 
                bar = &nfp->bar[4 + i];
-               bar->iomem = ioremap_nocache(nfp_bar_resource_start(bar),
+               bar->iomem = ioremap(nfp_bar_resource_start(bar),
                                             nfp_bar_resource_len(bar));
                if (bar->iomem) {
                        msg += snprintf(msg, end - msg,
@@ -858,7 +858,7 @@ static int nfp6000_area_acquire(struct nfp_cpp_area *area)
                priv->iomem = priv->bar->iomem + priv->bar_offset;
        else
                /* Must have been too big. Sub-allocate. */
-               priv->iomem = ioremap_nocache(priv->phys, priv->size);
+               priv->iomem = ioremap(priv->phys, priv->size);
 
        if (IS_ERR_OR_NULL(priv->iomem)) {
                dev_err(nfp->dev, "Can't ioremap() a %d byte region of BAR %d\n",
index 4d9bbcc..a6ae2cd 100644 (file)
@@ -1401,7 +1401,7 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx)
        }
 
        /* Shrink the original UC mapping of the memory BAR */
-       membase = ioremap_nocache(efx->membase_phys, uc_mem_map_size);
+       membase = ioremap(efx->membase_phys, uc_mem_map_size);
        if (!membase) {
                netif_err(efx, probe, efx->net_dev,
                          "could not shrink memory BAR to %x\n",
index 7a38d7f..6891df4 100644 (file)
@@ -1338,7 +1338,7 @@ static int efx_init_io(struct efx_nic *efx)
                rc = -EIO;
                goto fail3;
        }
-       efx->membase = ioremap_nocache(efx->membase_phys, mem_map_size);
+       efx->membase = ioremap(efx->membase_phys, mem_map_size);
        if (!efx->membase) {
                netif_err(efx, probe, efx->net_dev,
                          "could not map memory BAR at %llx+%x\n",
index eecc348..53ae9fa 100644 (file)
@@ -1265,7 +1265,7 @@ static int ef4_init_io(struct ef4_nic *efx)
                rc = -EIO;
                goto fail3;
        }
-       efx->membase = ioremap_nocache(efx->membase_phys, mem_map_size);
+       efx->membase = ioremap(efx->membase_phys, mem_map_size);
        if (!efx->membase) {
                netif_err(efx, probe, efx->net_dev,
                          "could not map memory BAR at %llx+%x\n",
index 38068fc..6d90a09 100644 (file)
@@ -2454,7 +2454,7 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
 
        pdata = netdev_priv(dev);
        dev->irq = irq;
-       pdata->ioaddr = ioremap_nocache(res->start, res_size);
+       pdata->ioaddr = ioremap(res->start, res_size);
        if (!pdata->ioaddr) {
                retval = -ENOMEM;
                goto out_ioremap_fail;
index 1b2702f..675f31d 100644 (file)
@@ -2019,7 +2019,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
                        goto quit;
                }
 
-               efuse = devm_ioremap_nocache(dev, res.start, size);
+               efuse = devm_ioremap(dev, res.start, size);
                if (!efuse) {
                        dev_err(dev, "could not map resource\n");
                        devm_release_mem_region(dev, res.start, size);
index 21c1b43..c66aab7 100644 (file)
@@ -1202,7 +1202,7 @@ static int temac_probe(struct platform_device *pdev)
 
        /* map device registers */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       lp->regs = devm_ioremap_nocache(&pdev->dev, res->start,
+       lp->regs = devm_ioremap(&pdev->dev, res->start,
                                        resource_size(res));
        if (IS_ERR(lp->regs)) {
                dev_err(&pdev->dev, "could not map TEMAC registers\n");
@@ -1296,7 +1296,7 @@ static int temac_probe(struct platform_device *pdev)
        } else if (pdata) {
                /* 2nd memory resource specifies DMA registers */
                res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-               lp->sdma_regs = devm_ioremap_nocache(&pdev->dev, res->start,
+               lp->sdma_regs = devm_ioremap(&pdev->dev, res->start,
                                                     resource_size(res));
                if (IS_ERR(lp->sdma_regs)) {
                        dev_err(&pdev->dev,
index 56b7791..077c684 100644 (file)
@@ -614,7 +614,7 @@ static int dfx_register(struct device *bdev)
 
        /* Set up I/O base address. */
        if (dfx_use_mmio) {
-               bp->base.mem = ioremap_nocache(bar_start[0], bar_len[0]);
+               bp->base.mem = ioremap(bar_start[0], bar_len[0]);
                if (!bp->base.mem) {
                        printk(KERN_ERR "%s: Cannot map MMIO\n", print_name);
                        err = -ENOMEM;
index 060712c..eaf85db 100644 (file)
@@ -1318,7 +1318,7 @@ static int fza_probe(struct device *bdev)
        }
 
        /* MMIO mapping setup. */
-       mmio = ioremap_nocache(start, len);
+       mmio = ioremap(start, len);
        if (!mmio) {
                pr_err("%s: cannot map MMIO\n", fp->name);
                ret = -ENOMEM;
index 8a4fbfa..065bb0a 100644 (file)
@@ -40,7 +40,7 @@ static u8 *fjes_hw_iomap(struct fjes_hw *hw)
                return NULL;
        }
 
-       base = (u8 *)ioremap_nocache(hw->hw_res.start, hw->hw_res.size);
+       base = (u8 *)ioremap(hw->hw_res.start, hw->hw_res.size);
 
        return base;
 }
index 34e94ee..23f93f1 100644 (file)
@@ -635,7 +635,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
        /* set up PLX mapping */
        plx_phy = pci_resource_start(pdev, 0);
 
-       card->plx = ioremap_nocache(plx_phy, 0x70);
+       card->plx = ioremap(plx_phy, 0x70);
        if (!card->plx) {
                pr_err("ioremap() failed\n");
                wanxl_pci_remove_one(pdev);
@@ -704,7 +704,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
                                               PCI_DMA_FROMDEVICE);
        }
 
-       mem = ioremap_nocache(mem_phy, PDM_OFFSET + sizeof(firmware));
+       mem = ioremap(mem_phy, PDM_OFFSET + sizeof(firmware));
        if (!mem) {
                pr_err("ioremap() failed\n");
                wanxl_pci_remove_one(pdev);
index f808541..ed87bc0 100644 (file)
@@ -458,7 +458,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar)
 
        ar_ahb->mem_len = resource_size(res);
 
-       ar_ahb->gcc_mem = ioremap_nocache(ATH10K_GCC_REG_BASE,
+       ar_ahb->gcc_mem = ioremap(ATH10K_GCC_REG_BASE,
                                          ATH10K_GCC_REG_SIZE);
        if (!ar_ahb->gcc_mem) {
                ath10k_err(ar, "gcc mem ioremap error\n");
@@ -466,7 +466,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar)
                goto err_mem_unmap;
        }
 
-       ar_ahb->tcsr_mem = ioremap_nocache(ATH10K_TCSR_REG_BASE,
+       ar_ahb->tcsr_mem = ioremap(ATH10K_TCSR_REG_BASE,
                                           ATH10K_TCSR_REG_SIZE);
        if (!ar_ahb->tcsr_mem) {
                ath10k_err(ar, "tcsr mem ioremap error\n");
index c0794f5..2c9cec8 100644 (file)
@@ -106,7 +106,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
                goto err_out;
        }
 
-       mem = ioremap_nocache(res->start, resource_size(res));
+       mem = ioremap(res->start, resource_size(res));
        if (mem == NULL) {
                dev_err(&pdev->dev, "ioremap failed\n");
                ret = -ENOMEM;
index 63019c3..cdefb8e 100644 (file)
@@ -92,7 +92,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       mem = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res));
+       mem = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (mem == NULL) {
                dev_err(&pdev->dev, "ioremap failed\n");
                return -ENOMEM;
index f64ce50..c85840c 100644 (file)
@@ -1643,8 +1643,8 @@ static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo)
                return -EINVAL;
        }
 
-       devinfo->regs = ioremap_nocache(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);
-       devinfo->tcm = ioremap_nocache(bar1_addr, bar1_size);
+       devinfo->regs = ioremap(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);
+       devinfo->tcm = ioremap(bar1_addr, bar1_size);
 
        if (!devinfo->regs || !devinfo->tcm) {
                brcmf_err(bus, "ioremap() failed (%p,%p)\n", devinfo->regs,
index c4c83ab..e85858e 100644 (file)
@@ -6167,7 +6167,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
        ioaddr = pci_iomap(pci_dev, 0, 0);
        if (!ioaddr) {
                printk(KERN_WARNING DRV_NAME
-                      "Error calling ioremap_nocache.\n");
+                      "Error calling ioremap.\n");
                err = -EIO;
                goto fail;
        }
index 1c69c40..e3357e9 100644 (file)
@@ -90,7 +90,7 @@ static int _store_optimized_voltages(struct device *dev,
                goto out_map;
        }
 
-       base = ioremap_nocache(res->start, resource_size(res));
+       base = ioremap(res->start, resource_size(res));
        if (!base) {
                dev_err(dev, "Unable to map Efuse registers\n");
                ret = -ENOMEM;
index ad290f7..a5507f7 100644 (file)
@@ -1534,7 +1534,7 @@ static int __init ccio_probe(struct parisc_device *dev)
        *ioc_p = ioc;
 
        ioc->hw_path = dev->hw_path;
-       ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096);
+       ioc->ioc_regs = ioremap(dev->hpa.start, 4096);
        if (!ioc->ioc_regs) {
                kfree(ioc);
                return -ENOMEM;
index 2f1cac8..889d7ce 100644 (file)
@@ -974,7 +974,7 @@ static int __init dino_probe(struct parisc_device *dev)
        }
 
        dino_dev->hba.dev = dev;
-       dino_dev->hba.base_addr = ioremap_nocache(hpa, 4096);
+       dino_dev->hba.base_addr = ioremap(hpa, 4096);
        dino_dev->hba.lmmio_space_offset = PCI_F_EXTEND;
        spin_lock_init(&dino_dev->dinosaur_pen);
        dino_dev->hba.iommu = ccio_get_iommu(dev);
index 37a2c5d..9d00a24 100644 (file)
@@ -354,10 +354,10 @@ static int __init eisa_probe(struct parisc_device *dev)
                        eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;
                }
        }
-       eisa_eeprom_addr = ioremap_nocache(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
+       eisa_eeprom_addr = ioremap(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
        if (!eisa_eeprom_addr) {
                result = -ENOMEM;
-               printk(KERN_ERR "EISA: ioremap_nocache failed!\n");
+               printk(KERN_ERR "EISA: ioremap failed!\n");
                goto error_free_irq;
        }
        result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space,
index 32f506f..8a3b0c3 100644 (file)
@@ -927,7 +927,7 @@ void *iosapic_register(unsigned long hpa)
                return NULL;
        }
 
-       isi->addr = ioremap_nocache(hpa, 4096);
+       isi->addr = ioremap(hpa, 4096);
        isi->isi_hpa = hpa;
        isi->isi_version = iosapic_rd_version(isi);
        isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;
index a99e385..732b516 100644 (file)
@@ -1134,7 +1134,7 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
                        ** Postable I/O port space is per PCI host adapter.
                        ** base of 64MB PIOP region
                        */
-                       lba_dev->iop_base = ioremap_nocache(p->start, 64 * 1024 * 1024);
+                       lba_dev->iop_base = ioremap(p->start, 64 * 1024 * 1024);
 
                        sprintf(lba_dev->hba.io_name, "PCI%02x Ports",
                                        (int)lba_dev->hba.bus_num.start);
@@ -1476,7 +1476,7 @@ lba_driver_probe(struct parisc_device *dev)
        u32 func_class;
        void *tmp_obj;
        char *version;
-       void __iomem *addr = ioremap_nocache(dev->hpa.start, 4096);
+       void __iomem *addr = ioremap(dev->hpa.start, 4096);
        int max;
 
        /* Read HW Rev First */
@@ -1575,7 +1575,7 @@ lba_driver_probe(struct parisc_device *dev)
        } else {
                if (!astro_iop_base) {
                        /* Sprockets PDC uses NPIOP region */
-                       astro_iop_base = ioremap_nocache(LBA_PORT_BASE, 64 * 1024);
+                       astro_iop_base = ioremap(LBA_PORT_BASE, 64 * 1024);
                        pci_port = &lba_astro_port_ops;
                }
 
@@ -1693,7 +1693,7 @@ void __init lba_init(void)
 */
 void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
 {
-       void __iomem * base_addr = ioremap_nocache(lba->hpa.start, 4096);
+       void __iomem * base_addr = ioremap(lba->hpa.start, 4096);
 
        imask <<= 2;    /* adjust for hints - 2 more bits */
 
index de8e4e3..7e11282 100644 (file)
@@ -1513,7 +1513,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 
 static void __iomem *ioc_remap(struct sba_device *sba_dev, unsigned int offset)
 {
-       return ioremap_nocache(sba_dev->dev->hpa.start + offset, SBA_FUNC_SIZE);
+       return ioremap(sba_dev->dev->hpa.start + offset, SBA_FUNC_SIZE);
 }
 
 static void sba_hw_init(struct sba_device *sba_dev)
@@ -1883,7 +1883,7 @@ static int __init sba_driver_callback(struct parisc_device *dev)
        u32 func_class;
        int i;
        char *version;
-       void __iomem *sba_addr = ioremap_nocache(dev->hpa.start, SBA_FUNC_SIZE);
+       void __iomem *sba_addr = ioremap(dev->hpa.start, SBA_FUNC_SIZE);
 #ifdef CONFIG_PROC_FS
        struct proc_dir_entry *root;
 #endif
index b20651c..9bf7fa9 100644 (file)
@@ -719,7 +719,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
        }
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ti_conf");
-       base = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       base = devm_ioremap(dev, res->start, resource_size(res));
        if (!base)
                return -ENOMEM;
 
index 3dd2e26..cfeccd7 100644 (file)
@@ -434,7 +434,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
        tbl_addr += (tbl_offset + ((interrupt_num - 1) * PCI_MSIX_ENTRY_SIZE));
        tbl_addr &= PCI_BASE_ADDRESS_MEM_MASK;
 
-       msix_tbl = ioremap_nocache(ep->phys_base + tbl_addr,
+       msix_tbl = ioremap(ep->phys_base + tbl_addr,
                                   PCI_MSIX_ENTRY_SIZE);
        if (!msix_tbl)
                return -EINVAL;
index c7709e4..6b43a54 100644 (file)
@@ -688,7 +688,7 @@ static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries)
        table_offset &= PCI_MSIX_TABLE_OFFSET;
        phys_addr = pci_resource_start(dev, bir) + table_offset;
 
-       return ioremap_nocache(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE);
+       return ioremap(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE);
 }
 
 static int msix_setup_entries(struct pci_dev *dev, void __iomem *base,
index e87196c..df21e32 100644 (file)
@@ -184,7 +184,7 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
                pci_warn(pdev, "can't ioremap BAR %d: %pR\n", bar, res);
                return NULL;
        }
-       return ioremap_nocache(res->start, resource_size(res));
+       return ioremap(res->start, resource_size(res));
 }
 EXPORT_SYMBOL_GPL(pci_ioremap_bar);
 
index 4937a08..0d92374 100644 (file)
@@ -1571,7 +1571,7 @@ static void asus_hides_smbus_lpc_ich6_suspend(struct pci_dev *dev)
 
        pci_read_config_dword(dev, 0xF0, &rcba);
        /* use bits 31:14, 16 kB aligned */
-       asus_rcba_base = ioremap_nocache(rcba & 0xFFFFC000, 0x4000);
+       asus_rcba_base = ioremap(rcba & 0xFFFFC000, 0x4000);
        if (asus_rcba_base == NULL)
                return;
 }
@@ -4784,7 +4784,7 @@ static int pci_quirk_enable_intel_lpc_acs(struct pci_dev *dev)
        if (!(rcba & INTEL_LPC_RCBA_ENABLE))
                return -EINVAL;
 
-       rcba_mem = ioremap_nocache(rcba & INTEL_LPC_RCBA_MASK,
+       rcba_mem = ioremap(rcba & INTEL_LPC_RCBA_MASK,
                                   PAGE_ALIGN(INTEL_UPDCR_REG));
        if (!rcba_mem)
                return -ENOMEM;
index 32f268f..57044ab 100644 (file)
@@ -1049,7 +1049,7 @@ static int ns2_pinmux_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        if (!res)
                return -EINVAL;
-       pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,
+       pinctrl->base1 = devm_ioremap(&pdev->dev, res->start,
                                        resource_size(res));
        if (!pinctrl->base1) {
                dev_err(&pdev->dev, "unable to map I/O space\n");
index 3756fc9..f1d60a7 100644 (file)
@@ -578,7 +578,7 @@ static int nsp_pinmux_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        if (!res)
                return -EINVAL;
-       pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,
+       pinctrl->base1 = devm_ioremap(&pdev->dev, res->start,
                                              resource_size(res));
        if (!pinctrl->base1) {
                dev_err(&pdev->dev, "unable to map I/O space\n");
index 7e29e3f..c00d002 100644 (file)
@@ -611,7 +611,7 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev,
        if (!res)
                return -ENOENT;
 
-       ipctl->base = devm_ioremap_nocache(&pdev->dev, res->start,
+       ipctl->base = devm_ioremap(&pdev->dev, res->start,
                        resource_size(res));
        if (!ipctl->base)
                return -ENOMEM;
index eab0782..73aff65 100644 (file)
@@ -866,7 +866,7 @@ static int amd_gpio_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       gpio_dev->base = devm_ioremap_nocache(&pdev->dev, res->start,
+       gpio_dev->base = devm_ioremap(&pdev->dev, res->start,
                                                resource_size(res));
        if (!gpio_dev->base)
                return -ENOMEM;
index cdab916..5ea5245 100644 (file)
@@ -652,7 +652,7 @@ static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        scu->ipc_base = pcim_iomap_table(pdev)[0];
 
-       scu->i2c_base = ioremap_nocache(pdata->i2c_base, pdata->i2c_len);
+       scu->i2c_base = ioremap(pdata->i2c_base, pdata->i2c_len);
        if (!scu->i2c_base)
                return -ENOMEM;
 
index df8565b..ebfcfea 100644 (file)
@@ -1156,7 +1156,7 @@ static int telemetry_pltdrv_probe(struct platform_device *pdev)
        telm_conf->ioss_config.ssram_base_addr = res1->start;
        telm_conf->ioss_config.ssram_size = size;
 
-       telm_conf->pss_config.regmap = ioremap_nocache(
+       telm_conf->pss_config.regmap = ioremap(
                                        telm_conf->pss_config.ssram_base_addr,
                                        telm_conf->pss_config.ssram_size);
        if (!telm_conf->pss_config.regmap) {
@@ -1164,7 +1164,7 @@ static int telemetry_pltdrv_probe(struct platform_device *pdev)
                goto out;
        }
 
-       telm_conf->ioss_config.regmap = ioremap_nocache(
+       telm_conf->ioss_config.regmap = ioremap(
                                telm_conf->ioss_config.ssram_base_addr,
                                telm_conf->ioss_config.ssram_size);
        if (!telm_conf->ioss_config.regmap) {
index 52ef141..3e3c66d 100644 (file)
@@ -489,7 +489,7 @@ static int pmc_setup_dev(struct pci_dev *pdev, const struct pci_device_id *ent)
        pci_read_config_dword(pdev, PMC_BASE_ADDR_OFFSET, &pmc->base_addr);
        pmc->base_addr &= PMC_BASE_ADDR_MASK;
 
-       pmc->regmap = ioremap_nocache(pmc->base_addr, PMC_MMIO_REG_LEN);
+       pmc->regmap = ioremap(pmc->base_addr, PMC_MMIO_REG_LEN);
        if (!pmc->regmap) {
                dev_err(&pdev->dev, "error: ioremap failed\n");
                return -ENOMEM;
index 9b6a93f..23e40aa 100644 (file)
@@ -1394,7 +1394,7 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung)
        int ret = 0;
        int i;
 
-       samsung->f0000_segment = ioremap_nocache(0xf0000, 0xffff);
+       samsung->f0000_segment = ioremap(0xf0000, 0xffff);
        if (!samsung->f0000_segment) {
                if (debug || force)
                        pr_err("Can't map the segment at 0xf0000\n");
@@ -1434,7 +1434,7 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung)
        if (debug)
                samsung_sabi_infos(samsung, loca, ifaceP);
 
-       samsung->sabi_iface = ioremap_nocache(ifaceP, 16);
+       samsung->sabi_iface = ioremap(ifaceP, 16);
        if (!samsung->sabi_iface) {
                pr_err("Can't remap %x\n", ifaceP);
                ret = -EINVAL;
index 89b9314..af9abcd 100644 (file)
@@ -748,7 +748,7 @@ static int ti_abb_probe(struct platform_device *pdev)
         * We may have shared interrupt register offsets which are
         * write-1-to-clear between domains ensuring exclusivity.
         */
-       abb->int_base = devm_ioremap_nocache(dev, res->start,
+       abb->int_base = devm_ioremap(dev, res->start,
                                             resource_size(res));
        if (!abb->int_base) {
                dev_err(dev, "Unable to map '%s'\n", pname);
@@ -768,7 +768,7 @@ static int ti_abb_probe(struct platform_device *pdev)
         * We may have shared efuse register offsets which are read-only
         * between domains
         */
-       abb->efuse_base = devm_ioremap_nocache(dev, res->start,
+       abb->efuse_base = devm_ioremap(dev, res->start,
                                               resource_size(res));
        if (!abb->efuse_base) {
                dev_err(dev, "Unable to map '%s'\n", pname);
index 579b3ff..feb1f8e 100644 (file)
@@ -504,7 +504,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        if (unlikely(!rtc->res))
                return -EBUSY;
 
-       rtc->regbase = devm_ioremap_nocache(&pdev->dev, rtc->res->start,
+       rtc->regbase = devm_ioremap(&pdev->dev, rtc->res->start,
                                        rtc->regsize);
        if (unlikely(!rtc->regbase))
                return -EINVAL;
index 8466aa7..8b891a0 100644 (file)
@@ -293,7 +293,7 @@ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
                if (!request_mem_region(start, 0x1000, "aic79xx"))
                        error = ENOMEM;
                if (!error) {
-                       *maddr = ioremap_nocache(base_page, base_offset + 512);
+                       *maddr = ioremap(base_page, base_offset + 512);
                        if (*maddr == NULL) {
                                error = ENOMEM;
                                release_mem_region(start, 0x1000);
index 717d8d1..9b293b1 100644 (file)
@@ -372,7 +372,7 @@ ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
                if (!request_mem_region(start, 0x1000, "aic7xxx"))
                        error = ENOMEM;
                if (error == 0) {
-                       *maddr = ioremap_nocache(start, 256);
+                       *maddr = ioremap(start, 256);
                        if (*maddr == NULL) {
                                error = ENOMEM;
                                release_mem_region(start, 0x1000);
index db687ef..40dc8ea 100644 (file)
@@ -270,7 +270,7 @@ static bool arcmsr_remap_pciregion(struct AdapterControlBlock *acb)
                break;
        }
        case ACB_ADAPTER_TYPE_C:{
-               acb->pmuC = ioremap_nocache(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
+               acb->pmuC = ioremap(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
                if (!acb->pmuC) {
                        printk(KERN_NOTICE "arcmsr%d: memory mapping region fail \n", acb->host->host_no);
                        return false;
index 0760d0b..9b81cfb 100644 (file)
@@ -453,14 +453,14 @@ static int beiscsi_map_pci_bars(struct beiscsi_hba *phba,
        u8 __iomem *addr;
        int pcicfg_reg;
 
-       addr = ioremap_nocache(pci_resource_start(pcidev, 2),
+       addr = ioremap(pci_resource_start(pcidev, 2),
                               pci_resource_len(pcidev, 2));
        if (addr == NULL)
                return -ENOMEM;
        phba->ctrl.csr = addr;
        phba->csr_va = addr;
 
-       addr = ioremap_nocache(pci_resource_start(pcidev, 4), 128 * 1024);
+       addr = ioremap(pci_resource_start(pcidev, 4), 128 * 1024);
        if (addr == NULL)
                goto pci_map_err;
        phba->ctrl.db = addr;
@@ -471,7 +471,7 @@ static int beiscsi_map_pci_bars(struct beiscsi_hba *phba,
        else
                pcicfg_reg = 0;
 
-       addr = ioremap_nocache(pci_resource_start(pcidev, pcicfg_reg),
+       addr = ioremap(pci_resource_start(pcidev, pcicfg_reg),
                               pci_resource_len(pcidev, pcicfg_reg));
 
        if (addr == NULL)
index f069e09..6f8335d 100644 (file)
@@ -1414,7 +1414,7 @@ int bnx2fc_map_doorbell(struct bnx2fc_rport *tgt)
        reg_base = pci_resource_start(hba->pcidev,
                                        BNX2X_DOORBELL_PCI_BAR);
        reg_off = (1 << BNX2X_DB_SHIFT) * (context_id & 0x1FFFF);
-       tgt->ctx_base = ioremap_nocache(reg_base + reg_off, 4);
+       tgt->ctx_base = ioremap(reg_base + reg_off, 4);
        if (!tgt->ctx_base)
                return -ENOMEM;
        return 0;
index 1266631..e53ebc5 100644 (file)
@@ -2715,7 +2715,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep)
                reg_base = pci_resource_start(ep->hba->pcidev,
                                              BNX2X_DOORBELL_PCI_BAR);
                reg_off = (1 << BNX2X_DB_SHIFT) * (cid_num & 0x1FFFF);
-               ep->qp.ctx_base = ioremap_nocache(reg_base + reg_off, 4);
+               ep->qp.ctx_base = ioremap(reg_base + reg_off, 4);
                if (!ep->qp.ctx_base)
                        return -ENOMEM;
                goto arm_cq;
@@ -2736,7 +2736,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep)
                /* 5709 device in normal node and 5706/5708 devices */
                reg_off = CTX_OFFSET + (MB_KERNEL_CTX_SIZE * cid_num);
 
-       ep->qp.ctx_base = ioremap_nocache(ep->hba->reg_base + reg_off,
+       ep->qp.ctx_base = ioremap(ep->hba->reg_base + reg_off,
                                          MB_KERNEL_CTX_SIZE);
        if (!ep->qp.ctx_base)
                return -ENOMEM;
index 2e8a3ac..8dea7d5 100644 (file)
@@ -529,7 +529,7 @@ static struct csio_hw *csio_hw_alloc(struct pci_dev *pdev)
                goto err_free_hw;
 
        /* Get the start address of registers from BAR 0 */
-       hw->regstart = ioremap_nocache(pci_resource_start(pdev, 0),
+       hw->regstart = ioremap(pci_resource_start(pdev, 0),
                                       pci_resource_len(pdev, 0));
        if (!hw->regstart) {
                csio_err(hw, "Could not map BAR 0, regstart = %p\n",
index 216e557..1a4ddfa 100644 (file)
@@ -6876,7 +6876,7 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
 {
        ulong page_base = ((ulong) base) & PAGE_MASK;
        ulong page_offs = ((ulong) base) - page_base;
-       void __iomem *page_remapped = ioremap_nocache(page_base,
+       void __iomem *page_remapped = ioremap(page_base,
                page_offs + size);
 
        return page_remapped ? (page_remapped + page_offs) : NULL;
index abac2f3..c48a73a 100644 (file)
@@ -98,7 +98,7 @@ lasi700_probe(struct parisc_device *dev)
 
        hostdata->dev = &dev->dev;
        dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
-       hostdata->base = ioremap_nocache(base, 0x100);
+       hostdata->base = ioremap(base, 0x100);
        hostdata->differential = 0;
 
        if (dev->id.sversion == LASI_700_SVERSION) {
index f6ac819..8443f2f 100644 (file)
@@ -731,7 +731,7 @@ megaraid_init_mbox(adapter_t *adapter)
                goto out_free_raid_dev;
        }
 
-       raid_dev->baseaddr = ioremap_nocache(raid_dev->baseport, 128);
+       raid_dev->baseaddr = ioremap(raid_dev->baseport, 128);
 
        if (!raid_dev->baseaddr) {
 
index a4bc814..c60cd9f 100644 (file)
@@ -5875,7 +5875,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
        }
 
        base_addr = pci_resource_start(instance->pdev, instance->bar);
-       instance->reg_set = ioremap_nocache(base_addr, 8192);
+       instance->reg_set = ioremap(base_addr, 8192);
 
        if (!instance->reg_set) {
                dev_printk(KERN_DEBUG, &instance->pdev->dev, "Failed to map IO mem\n");
index 539ac8c..d4bd31a 100644 (file)
@@ -3531,7 +3531,7 @@ static struct myrb_hba *myrb_detect(struct pci_dev *pdev,
        spin_lock_init(&cb->queue_lock);
        if (mmio_size < PAGE_SIZE)
                mmio_size = PAGE_SIZE;
-       cb->mmio_base = ioremap_nocache(cb->pci_addr & PAGE_MASK, mmio_size);
+       cb->mmio_base = ioremap(cb->pci_addr & PAGE_MASK, mmio_size);
        if (cb->mmio_base == NULL) {
                dev_err(&pdev->dev,
                        "Unable to map Controller Register Window\n");
index eb0dd56..5c56664 100644 (file)
@@ -2311,7 +2311,7 @@ static struct myrs_hba *myrs_detect(struct pci_dev *pdev,
        /* Map the Controller Register Window. */
        if (mmio_size < PAGE_SIZE)
                mmio_size = PAGE_SIZE;
-       cs->mmio_base = ioremap_nocache(cs->pci_addr & PAGE_MASK, mmio_size);
+       cs->mmio_base = ioremap(cs->pci_addr & PAGE_MASK, mmio_size);
        if (cs->mmio_base == NULL) {
                dev_err(&pdev->dev,
                        "Unable to map Controller Register Window\n");
index 93616f9..d79ce97 100644 (file)
@@ -1560,7 +1560,7 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev, void *priv_data)
                        goto next_entry;
 
                data->MmioAddress = (unsigned long)
-                       ioremap_nocache(p_dev->resource[2]->start,
+                       ioremap(p_dev->resource[2]->start,
                                        resource_size(p_dev->resource[2]));
                data->MmioLength  = resource_size(p_dev->resource[2]);
        }
index 605b59c..a3a44d4 100644 (file)
@@ -789,7 +789,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha)
        }
 
        ha->cregbase =
-           ioremap_nocache(pci_resource_start(ha->pdev, 0), BAR0_LEN_FX00);
+           ioremap(pci_resource_start(ha->pdev, 0), BAR0_LEN_FX00);
        if (!ha->cregbase) {
                ql_log_pci(ql_log_fatal, ha->pdev, 0x0128,
                    "cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));
@@ -810,7 +810,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha)
        }
 
        ha->iobase =
-           ioremap_nocache(pci_resource_start(ha->pdev, 2), BAR2_LEN_FX00);
+           ioremap(pci_resource_start(ha->pdev, 2), BAR2_LEN_FX00);
        if (!ha->iobase) {
                ql_log_pci(ql_log_fatal, ha->pdev, 0x012b,
                    "cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));
index 412ac56..b749256 100644 (file)
@@ -7457,7 +7457,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
                goto disable_device;
        }
 
-       ctrl_info->iomem_base = ioremap_nocache(pci_resource_start(
+       ctrl_info->iomem_base = ioremap(pci_resource_start(
                ctrl_info->pci_dev, 0),
                sizeof(struct pqi_ctrl_registers));
        if (!ctrl_info->iomem_base) {
index a85d52b..f839797 100644 (file)
@@ -71,7 +71,7 @@ static int snirm710_probe(struct platform_device *dev)
 
        hostdata->dev = &dev->dev;
        dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
-       hostdata->base = ioremap_nocache(base, 0x100);
+       hostdata->base = ioremap(base, 0x100);
        hostdata->differential = 0;
 
        hostdata->clock = SNIRM710_CLOCK;
index 440a73e..f37df79 100644 (file)
@@ -190,7 +190,7 @@ static int esp_sun3x_probe(struct platform_device *dev)
        if (!res || !res->start)
                goto fail_unlink;
 
-       esp->regs = ioremap_nocache(res->start, 0x20);
+       esp->regs = ioremap(res->start, 0x20);
        if (!esp->regs)
                goto fail_unmap_regs;
 
@@ -198,7 +198,7 @@ static int esp_sun3x_probe(struct platform_device *dev)
        if (!res || !res->start)
                goto fail_unmap_regs;
 
-       esp->dma_regs = ioremap_nocache(res->start, 0x10);
+       esp->dma_regs = ioremap(res->start, 0x10);
 
        esp->command_block = dma_alloc_coherent(esp->dev, 16,
                                                &esp->command_block_dma,
index 77bce20..7eac76c 100644 (file)
@@ -89,7 +89,7 @@ zalon_probe(struct parisc_device *dev)
        struct gsc_irq gsc_irq;
        u32 zalon_vers;
        int error = -ENODEV;
-       void __iomem *zalon = ioremap_nocache(dev->hpa.start, 4096);
+       void __iomem *zalon = ioremap(dev->hpa.start, 4096);
        void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET;
        static int unit = 0;
        struct Scsi_Host *host;
index a23a8e5..bdd82e4 100644 (file)
@@ -801,7 +801,7 @@ static int zorro_esp_probe(struct zorro_dev *z,
        /* additional setup required for Fastlane */
        if (zep->zorro3 && ent->driver_data == ZORRO_BLZ1230II) {
                /* map full address space up to ESP base for DMA */
-               zep->board_base = ioremap_nocache(board,
+               zep->board_base = ioremap(board,
                                                FASTLANE_ESP_ADDR-1);
                if (!zep->board_base) {
                        pr_err("Cannot allocate board address space\n");
@@ -816,7 +816,7 @@ static int zorro_esp_probe(struct zorro_dev *z,
        esp->ops = zdd->esp_ops;
 
        if (ioaddr > 0xffffff)
-               esp->regs = ioremap_nocache(ioaddr, 0x20);
+               esp->regs = ioremap(ioaddr, 0x20);
        else
                /* ZorroII address space remapped nocache by early startup */
                esp->regs = ZTWO_VADDR(ioaddr);
@@ -842,7 +842,7 @@ static int zorro_esp_probe(struct zorro_dev *z,
                 * Only Fastlane Z3 for now - add switch for correct struct
                 * dma_registers size if adding any more
                 */
-               esp->dma_regs = ioremap_nocache(dmaaddr,
+               esp->dma_regs = ioremap(dmaaddr,
                                sizeof(struct fastlane_dma_registers));
        } else
                /* ZorroII address space remapped nocache by early startup */
index 9475353..d996782 100644 (file)
@@ -368,7 +368,7 @@ static int clk_establish_mapping(struct clk *clk)
        if (!mapping->base && mapping->phys) {
                kref_init(&mapping->ref);
 
-               mapping->base = ioremap_nocache(mapping->phys, mapping->len);
+               mapping->base = ioremap(mapping->phys, mapping->len);
                if (unlikely(!mapping->base))
                        return -ENXIO;
        } else if (mapping->base) {
index 8485e81..f8e070d 100644 (file)
@@ -213,7 +213,7 @@ int __init register_intc_controller(struct intc_desc *desc)
                        WARN_ON(resource_type(res) != IORESOURCE_MEM);
                        d->window[k].phys = res->start;
                        d->window[k].size = resource_size(res);
-                       d->window[k].virt = ioremap_nocache(res->start,
+                       d->window[k].virt = ioremap(res->start,
                                                         resource_size(res));
                        if (!d->window[k].virt)
                                goto err2;
index 87d69e7..f9f043a 100644 (file)
@@ -73,7 +73,7 @@ int register_intc_userimask(unsigned long addr)
        if (unlikely(uimask))
                return -EBUSY;
 
-       uimask = ioremap_nocache(addr, SZ_4K);
+       uimask = ioremap(addr, SZ_4K);
        if (unlikely(!uimask))
                return -ENOMEM;
 
index eb96a30..5db919d 100644 (file)
@@ -219,7 +219,7 @@ static int __init tegra_flowctrl_init(void)
                return 0;
        }
 
-       tegra_flowctrl_base = ioremap_nocache(res.start, resource_size(&res));
+       tegra_flowctrl_base = ioremap(res.start, resource_size(&res));
        if (!tegra_flowctrl_base)
                return -ENXIO;
 
index 4d719d4..606abbe 100644 (file)
@@ -408,7 +408,7 @@ static int __init tegra_init_fuse(void)
                }
        }
 
-       fuse->base = ioremap_nocache(regs.start, resource_size(&regs));
+       fuse->base = ioremap(regs.start, resource_size(&regs));
        if (!fuse->base) {
                pr_err("failed to map FUSE registers\n");
                return -ENXIO;
index df76778..a2fd6cc 100644 (file)
@@ -159,11 +159,11 @@ void __init tegra_init_apbmisc(void)
                }
        }
 
-       apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));
+       apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
        if (!apbmisc_base)
                pr_err("failed to map APBMISC registers\n");
 
-       strapping_base = ioremap_nocache(straps.start, resource_size(&straps));
+       strapping_base = ioremap(straps.start, resource_size(&straps));
        if (!strapping_base)
                pr_err("failed to map strapping options registers\n");
 
index ea0e11a..1699dda 100644 (file)
@@ -2826,7 +2826,7 @@ static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc,
 
        of_address_to_resource(np, index, &regs);
 
-       wake = ioremap_nocache(regs.start, resource_size(&regs));
+       wake = ioremap(regs.start, resource_size(&regs));
        if (!wake) {
                dev_err(pmc->dev, "failed to map PMC wake registers\n");
                return;
@@ -3097,7 +3097,7 @@ static int __init tegra_pmc_early_init(void)
                }
        }
 
-       pmc->base = ioremap_nocache(regs.start, resource_size(&regs));
+       pmc->base = ioremap(regs.start, resource_size(&regs));
        if (!pmc->base) {
                pr_err("failed to map PMC registers\n");
                of_node_put(np);
index a840c02..a3aa409 100644 (file)
@@ -511,7 +511,7 @@ static int xvcu_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       xvcu->vcu_slcr_ba = devm_ioremap_nocache(&pdev->dev, res->start,
+       xvcu->vcu_slcr_ba = devm_ioremap(&pdev->dev, res->start,
                                                 resource_size(res));
        if (!xvcu->vcu_slcr_ba) {
                dev_err(&pdev->dev, "vcu_slcr register mapping failed.\n");
@@ -524,7 +524,7 @@ static int xvcu_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       xvcu->logicore_reg_ba = devm_ioremap_nocache(&pdev->dev, res->start,
+       xvcu->logicore_reg_ba = devm_ioremap(&pdev->dev, res->start,
                                                     resource_size(res));
        if (!xvcu->logicore_reg_ba) {
                dev_err(&pdev->dev, "logicore register mapping failed.\n");
index 2663bb1..0d86c37 100644 (file)
@@ -301,7 +301,7 @@ int dw_spi_mid_init(struct dw_spi *dws)
        void __iomem *clk_reg;
        u32 clk_cdiv;
 
-       clk_reg = ioremap_nocache(MRST_CLK_SPI_REG, 16);
+       clk_reg = ioremap(MRST_CLK_SPI_REG, 16);
        if (!clk_reg)
                return -ENOMEM;
 
index cc49fa4..bba10f0 100644 (file)
@@ -170,7 +170,7 @@ static int jcore_spi_probe(struct platform_device *pdev)
        if (!devm_request_mem_region(&pdev->dev, res->start,
                                     resource_size(res), pdev->name))
                goto exit_busy;
-       hw->base = devm_ioremap_nocache(&pdev->dev, res->start,
+       hw->base = devm_ioremap(&pdev->dev, res->start,
                                        resource_size(res));
        if (!hw->base)
                goto exit_busy;
index cb52fd8..d25ee32 100644 (file)
@@ -603,7 +603,7 @@ static int npcm_fiu_dirmap_create(struct spi_mem_dirmap_desc *desc)
 
        if (!chip->flash_region_mapped_ptr) {
                chip->flash_region_mapped_ptr =
-                       devm_ioremap_nocache(fiu->dev, (fiu->res_mem->start +
+                       devm_ioremap(fiu->dev, (fiu->res_mem->start +
                                                        (fiu->info->max_map_size *
                                                    desc->mem->spi->chip_select)),
                                             (u32)desc->info.length);
index 06b68dd..bc27596 100644 (file)
@@ -63,7 +63,7 @@ int ssb_extif_serial_init(struct ssb_extif *extif, struct ssb_serial_port *ports
        for (i = 0; i < 2; i++) {
                void __iomem *uart_regs;
 
-               uart_regs = ioremap_nocache(SSB_EUART, 16);
+               uart_regs = ioremap(SSB_EUART, 16);
                if (uart_regs) {
                        uart_regs += (i * 8);
 
index 6a5622e..c118641 100644 (file)
@@ -122,7 +122,7 @@ static int ssb_extpci_read_config(struct ssb_pcicore *pc,
        if (unlikely(!addr))
                goto out;
        err = -ENOMEM;
-       mmio = ioremap_nocache(addr, len);
+       mmio = ioremap(addr, len);
        if (!mmio)
                goto out;
 
@@ -168,7 +168,7 @@ static int ssb_extpci_write_config(struct ssb_pcicore *pc,
        if (unlikely(!addr))
                goto out;
        err = -ENOMEM;
-       mmio = ioremap_nocache(addr, len);
+       mmio = ioremap(addr, len);
        if (!mmio)
                goto out;
 
@@ -382,7 +382,7 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
        /* Ok, ready to run, register it to the system.
         * The following needs change, if we want to port hostmode
         * to non-MIPS platform. */
-       ssb_pcicore_controller.io_map_base = (unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000);
+       ssb_pcicore_controller.io_map_base = (unsigned long)ioremap(SSB_PCI_MEM, 0x04000000);
        set_io_port_base(ssb_pcicore_controller.io_map_base);
        /* Give some time to the PCI controller to configure itself with the new
         * values. Not waiting at this point causes crashes of the machine. */
index cd8be80..be6b50f 100644 (file)
@@ -303,7 +303,7 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num)
        }
 
        gasket_dev->bar_data[bar_num].virt_base =
-               ioremap_nocache(gasket_dev->bar_data[bar_num].phys_base,
+               ioremap(gasket_dev->bar_data[bar_num].phys_base,
                                gasket_dev->bar_data[bar_num].length_bytes);
        if (!gasket_dev->bar_data[bar_num].virt_base) {
                dev_err(gasket_dev->dev,
index 0a23727..93cf28f 100644 (file)
@@ -338,7 +338,7 @@ static int kp2000_pcie_probe(struct pci_dev *pdev,
        reg_bar_phys_addr = pci_resource_start(pcard->pdev, REG_BAR);
        reg_bar_phys_len = pci_resource_len(pcard->pdev, REG_BAR);
 
-       pcard->regs_bar_base = ioremap_nocache(reg_bar_phys_addr, PAGE_SIZE);
+       pcard->regs_bar_base = ioremap(reg_bar_phys_addr, PAGE_SIZE);
        if (!pcard->regs_bar_base) {
                dev_err(&pcard->pdev->dev,
                        "probe: REG_BAR could not remap memory to virtual space\n");
@@ -367,7 +367,7 @@ static int kp2000_pcie_probe(struct pci_dev *pdev,
        dma_bar_phys_addr = pci_resource_start(pcard->pdev, DMA_BAR);
        dma_bar_phys_len = pci_resource_len(pcard->pdev, DMA_BAR);
 
-       pcard->dma_bar_base = ioremap_nocache(dma_bar_phys_addr,
+       pcard->dma_bar_base = ioremap(dma_bar_phys_addr,
                                              dma_bar_phys_len);
        if (!pcard->dma_bar_base) {
                dev_err(&pcard->pdev->dev,
index 5460bf9..592099a 100644 (file)
@@ -659,7 +659,7 @@ static int pi2c_probe(struct platform_device *pldev)
        if (!res)
                return -ENXIO;
 
-       priv->smba = (unsigned long)devm_ioremap_nocache(&pldev->dev,
+       priv->smba = (unsigned long)devm_ioremap(&pldev->dev,
                                                         res->start,
                                                         resource_size(res));
        if (!priv->smba)
index 8becf97..1c360da 100644 (file)
@@ -464,7 +464,7 @@ kp_spi_probe(struct platform_device *pldev)
                goto free_master;
        }
 
-       kpspi->base = devm_ioremap_nocache(&pldev->dev, r->start,
+       kpspi->base = devm_ioremap(&pldev->dev, r->start,
                                           resource_size(r));
 
        status = spi_register_master(master);
index a05ae6d..ec79a85 100644 (file)
@@ -122,7 +122,7 @@ int  kpc_dma_probe(struct platform_device *pldev)
                rv = -ENXIO;
                goto err_kfree;
        }
-       ldev->eng_regs = ioremap_nocache(r->start, resource_size(r));
+       ldev->eng_regs = ioremap(r->start, resource_size(r));
        if (!ldev->eng_regs) {
                dev_err(&ldev->pldev->dev, "%s: failed to ioremap engine regs!\n", __func__);
                rv = -ENXIO;
index 6f0cd07..3be4169 100644 (file)
@@ -2914,7 +2914,7 @@ static int allegro_probe(struct platform_device *pdev)
                        "regs resource missing from device tree\n");
                return -EINVAL;
        }
-       regs = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res));
+       regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (IS_ERR(regs)) {
                dev_err(&pdev->dev, "failed to map registers\n");
                return PTR_ERR(regs);
@@ -2932,7 +2932,7 @@ static int allegro_probe(struct platform_device *pdev)
                        "sram resource missing from device tree\n");
                return -EINVAL;
        }
-       sram_regs = devm_ioremap_nocache(&pdev->dev,
+       sram_regs = devm_ioremap(&pdev->dev,
                                         sram_res->start,
                                         resource_size(sram_res));
        if (IS_ERR(sram_regs)) {
index 6ad4515..d890d38 100644 (file)
@@ -4455,7 +4455,7 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
        pdev->needs_freset = 1;
        pci_save_state(pdev);
        qdev->reg_base =
-           ioremap_nocache(pci_resource_start(pdev, 1),
+           ioremap(pci_resource_start(pdev, 1),
                            pci_resource_len(pdev, 1));
        if (!qdev->reg_base) {
                dev_err(&pdev->dev, "Register mapping failed.\n");
@@ -4465,7 +4465,7 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
 
        qdev->doorbell_area_size = pci_resource_len(pdev, 3);
        qdev->doorbell_area =
-           ioremap_nocache(pci_resource_start(pdev, 3),
+           ioremap(pci_resource_start(pdev, 3),
                            pci_resource_len(pdev, 3));
        if (!qdev->doorbell_area) {
                dev_err(&pdev->dev, "Doorbell register mapping failed.\n");
index dace81a..e895473 100644 (file)
@@ -2463,7 +2463,7 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev,
        }
 
 
-       ioaddr = (unsigned long)ioremap_nocache(pmem_start, pmem_len);
+       ioaddr = (unsigned long)ioremap(pmem_start, pmem_len);
        if (ioaddr == (unsigned long)NULL) {
                netdev_err(dev, "ioremap failed!");
                goto err_rel_mem;
index cb95ad6..fbb42e5 100644 (file)
@@ -858,7 +858,7 @@ static int rtsx_probe(struct pci_dev *pci,
        dev_info(&pci->dev, "Resource length: 0x%x\n",
                 (unsigned int)pci_resource_len(pci, 0));
        dev->addr = pci_resource_start(pci, 0);
-       dev->remap_addr = ioremap_nocache(dev->addr, pci_resource_len(pci, 0));
+       dev->remap_addr = ioremap(dev->addr, pci_resource_len(pci, 0));
        if (!dev->remap_addr) {
                dev_err(&pci->dev, "ioremap error\n");
                err = -ENXIO;
index ea1d3d4..b8d6070 100644 (file)
@@ -50,7 +50,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
        }
 
        /* now map mmio and vidmem */
-       sm750_dev->pvReg = ioremap_nocache(sm750_dev->vidreg_start,
+       sm750_dev->pvReg = ioremap(sm750_dev->vidreg_start,
                                           sm750_dev->vidreg_size);
        if (!sm750_dev->pvReg) {
                pr_err("mmio failed\n");
index 34020ed..a5ab255 100644 (file)
@@ -216,11 +216,11 @@ int whcrc_setup_rc_umc(struct whcrc *whcrc)
                goto error_request_region;
        }
 
-       whcrc->rc_base = ioremap_nocache(whcrc->area, whcrc->rc_len);
+       whcrc->rc_base = ioremap(whcrc->area, whcrc->rc_len);
        if (whcrc->rc_base == NULL) {
                dev_err(dev, "can't ioremap registers (%zu bytes @ 0x%lx): %d\n",
                        whcrc->rc_len, whcrc->area, result);
-               goto error_ioremap_nocache;
+               goto error_ioremap;
        }
 
        result = request_irq(umc_dev->irq, whcrc_irq_cb, IRQF_SHARED,
@@ -254,7 +254,7 @@ error_cmd_buffer:
        free_irq(umc_dev->irq, whcrc);
 error_request_irq:
        iounmap(whcrc->rc_base);
-error_ioremap_nocache:
+error_ioremap:
        release_mem_region(whcrc->area, whcrc->rc_len);
 error_request_region:
        return result;
index cf3fad2..c5b17dd 100644 (file)
@@ -47,7 +47,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
        for (slot = 0; slot < tbus->num_tcslots; slot++) {
                slotaddr = tbus->slot_base + slot * slotsize;
                extslotaddr = tbus->ext_slot_base + slot * extslotsize;
-               module = ioremap_nocache(slotaddr, slotsize);
+               module = ioremap(slotaddr, slotsize);
                BUG_ON(!module);
 
                offset = TC_OLDCARD;
index 4562c80..a6aabfd 100644 (file)
@@ -3256,7 +3256,7 @@ static int __init cy_detect_isa(void)
                        return nboard;
 
                /* probe for CD1400... */
-               cy_isa_address = ioremap_nocache(isa_address, CyISA_Ywin);
+               cy_isa_address = ioremap(isa_address, CyISA_Ywin);
                if (cy_isa_address == NULL) {
                        printk(KERN_ERR "Cyclom-Y/ISA: can't remap base "
                                        "address\n");
@@ -3690,13 +3690,13 @@ static int cy_pci_probe(struct pci_dev *pdev,
                        device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
                card_name = "Cyclom-Y";
 
-               addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
+               addr0 = ioremap(pci_resource_start(pdev, 0),
                                CyPCI_Yctl);
                if (addr0 == NULL) {
                        dev_err(&pdev->dev, "can't remap ctl region\n");
                        goto err_reg;
                }
-               addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
+               addr2 = ioremap(pci_resource_start(pdev, 2),
                                CyPCI_Ywin);
                if (addr2 == NULL) {
                        dev_err(&pdev->dev, "can't remap base region\n");
@@ -3712,7 +3712,7 @@ static int cy_pci_probe(struct pci_dev *pdev,
        } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
                struct RUNTIME_9060 __iomem *ctl_addr;
 
-               ctl_addr = addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
+               ctl_addr = addr0 = ioremap(pci_resource_start(pdev, 0),
                                CyPCI_Zctl);
                if (addr0 == NULL) {
                        dev_err(&pdev->dev, "can't remap ctl region\n");
@@ -3727,7 +3727,7 @@ static int cy_pci_probe(struct pci_dev *pdev,
 
                mailbox = readl(&ctl_addr->mail_box_0);
 
-               addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
+               addr2 = ioremap(pci_resource_start(pdev, 2),
                                mailbox == ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);
                if (addr2 == NULL) {
                        dev_err(&pdev->dev, "can't remap base region\n");
index 4c1cd49..620d848 100644 (file)
@@ -898,7 +898,7 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)
        atomic_set(&priv->xmit_total, 0);
        raw_spin_lock_init(&priv->lock);
 
-       priv->reg = devm_ioremap_nocache(priv->dev, dev->res.start,
+       priv->reg = devm_ioremap(priv->dev, dev->res.start,
                                         resource_size(&dev->res));
        if (!priv->reg) {
                dev_err(priv->dev, "ioremap failed for resource %pR\n",
index 3a1a5e0..9f13f7d 100644 (file)
@@ -961,7 +961,7 @@ static int moxa_pci_probe(struct pci_dev *pdev,
                goto err;
        }
 
-       board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);
+       board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000);
        if (board->basemem == NULL) {
                dev_err(&pdev->dev, "can't remap io space 2\n");
                retval = -ENOMEM;
@@ -1071,7 +1071,7 @@ static int __init moxa_init(void)
                        brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :
                                        numports[i];
                        brd->busType = MOXA_BUS_TYPE_ISA;
-                       brd->basemem = ioremap_nocache(baseaddr[i], 0x4000);
+                       brd->basemem = ioremap(baseaddr[i], 0x4000);
                        if (!brd->basemem) {
                                printk(KERN_ERR "MOXA: can't remap %lx\n",
                                                baseaddr[i]);
index 0809ae2..673cda3 100644 (file)
@@ -55,7 +55,7 @@ static int __init serial_init_chip(struct parisc_device *dev)
        uart.port.uartclk       = (dev->id.sversion != 0xad) ?
                                        7272727 : 1843200;
        uart.port.mapbase       = address;
-       uart.port.membase       = ioremap_nocache(address, 16);
+       uart.port.membase       = ioremap(address, 16);
        if (!uart.port.membase) {
                dev_warn(&dev->dev, "Failed to map memory\n");
                return -ENOMEM;
index 836e736..e603c66 100644 (file)
@@ -1147,7 +1147,7 @@ static int omap8250_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
 
-       membase = devm_ioremap_nocache(&pdev->dev, regs->start,
+       membase = devm_ioremap(&pdev->dev, regs->start,
                                       resource_size(regs));
        if (!membase)
                return -ENODEV;
index 022924d..939685f 100644 (file)
@@ -275,7 +275,7 @@ static int pci_plx9050_init(struct pci_dev *dev)
        /*
         * enable/disable interrupts
         */
-       p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
+       p = ioremap(pci_resource_start(dev, 0), 0x80);
        if (p == NULL)
                return -ENOMEM;
        writel(irq_config, p + 0x4c);
@@ -299,7 +299,7 @@ static void pci_plx9050_exit(struct pci_dev *dev)
        /*
         * disable interrupts
         */
-       p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
+       p = ioremap(pci_resource_start(dev, 0), 0x80);
        if (p != NULL) {
                writel(0, p + 0x4c);
 
@@ -475,7 +475,7 @@ static int pci_siig10x_init(struct pci_dev *dev)
                break;
        }
 
-       p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
+       p = ioremap(pci_resource_start(dev, 0), 0x80);
        if (p == NULL)
                return -ENOMEM;
 
index 9065591..9ff5dfa 100644 (file)
@@ -2766,7 +2766,7 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
                }
 
                if (port->flags & UPF_IOREMAP) {
-                       port->membase = ioremap_nocache(port->mapbase, size);
+                       port->membase = ioremap(port->mapbase, size);
                        if (!port->membase) {
                                release_mem_region(port->mapbase, size);
                                ret = -ENOMEM;
index 7b57e84..730da41 100644 (file)
@@ -677,7 +677,7 @@ static void dz_release_port(struct uart_port *uport)
 static int dz_map_port(struct uart_port *uport)
 {
        if (!uport->membase)
-               uport->membase = ioremap_nocache(uport->mapbase,
+               uport->membase = ioremap(uport->mapbase,
                                                 dec_kn_slot_size);
        if (!uport->membase) {
                printk(KERN_ERR "dz: Cannot map MMIO\n");
index fcbea43..f67226d 100644 (file)
@@ -549,7 +549,7 @@ lqasc_request_port(struct uart_port *port)
        }
 
        if (port->flags & UPF_IOREMAP) {
-               port->membase = devm_ioremap_nocache(&pdev->dev,
+               port->membase = devm_ioremap(&pdev->dev,
                        port->mapbase, size);
                if (port->membase == NULL)
                        return -ENOMEM;
index fbc5bc0..164b183 100644 (file)
@@ -411,7 +411,7 @@ static int meson_uart_request_port(struct uart_port *port)
                return -EBUSY;
        }
 
-       port->membase = devm_ioremap_nocache(port->dev, port->mapbase,
+       port->membase = devm_ioremap(port->dev, port->mapbase,
                                             port->mapsize);
        if (!port->membase)
                return -ENOMEM;
index 00ce31e..fc58a00 100644 (file)
@@ -474,7 +474,7 @@ static int __init mux_probe(struct parisc_device *dev)
                port->iobase    = 0;
                port->mapbase   = dev->hpa.start + MUX_OFFSET +
                                                (i * MUX_LINE_OFFSET);
-               port->membase   = ioremap_nocache(port->mapbase, MUX_LINE_OFFSET);
+               port->membase   = ioremap(port->mapbase, MUX_LINE_OFFSET);
                port->iotype    = UPIO_MEM;
                port->type      = PORT_MUX;
                port->irq       = 0;
index d2d8b34..42c8cc9 100644 (file)
@@ -427,7 +427,7 @@ static int owl_uart_request_port(struct uart_port *port)
                return -EBUSY;
 
        if (port->flags & UPF_IOREMAP) {
-               port->membase = devm_ioremap_nocache(port->dev, port->mapbase,
+               port->membase = devm_ioremap(port->dev, port->mapbase,
                                resource_size(res));
                if (!port->membase)
                        return -EBUSY;
index 0bdf168..484b7e8 100644 (file)
@@ -618,7 +618,7 @@ static int pic32_uart_request_port(struct uart_port *port)
                                "pic32_uart_mem"))
                return -EBUSY;
 
-       port->membase = devm_ioremap_nocache(port->dev, port->mapbase,
+       port->membase = devm_ioremap(port->dev, port->mapbase,
                                                resource_size(res_mem));
        if (!port->membase) {
                dev_err(port->dev, "Unable to map registers\n");
index ff9a27d..b5ef86a 100644 (file)
@@ -498,7 +498,7 @@ static int rda_uart_request_port(struct uart_port *port)
                return -EBUSY;
 
        if (port->flags & UPF_IOREMAP) {
-               port->membase = devm_ioremap_nocache(port->dev, port->mapbase,
+               port->membase = devm_ioremap(port->dev, port->mapbase,
                                                     resource_size(res));
                if (!port->membase)
                        return -EBUSY;
index 329aced..7c99340 100644 (file)
@@ -668,7 +668,7 @@ static int sbd_map_port(struct uart_port *uport)
        struct sbd_duart *duart = sport->duart;
 
        if (!uport->membase)
-               uport->membase = ioremap_nocache(uport->mapbase,
+               uport->membase = ioremap(uport->mapbase,
                                                 DUART_CHANREG_SPACING);
        if (!uport->membase) {
                printk(err);
@@ -676,7 +676,7 @@ static int sbd_map_port(struct uart_port *uport)
        }
 
        if (!sport->memctrl)
-               sport->memctrl = ioremap_nocache(duart->mapctrl,
+               sport->memctrl = ioremap(duart->mapctrl,
                                                 DUART_CHANREG_SPACING);
        if (!sport->memctrl) {
                printk(err);
index 58bf9d4..87ca629 100644 (file)
@@ -2680,7 +2680,7 @@ static int sci_remap_port(struct uart_port *port)
                return 0;
 
        if (port->dev->of_node || (port->flags & UPF_IOREMAP)) {
-               port->membase = ioremap_nocache(port->mapbase, sport->reg_size);
+               port->membase = ioremap(port->mapbase, sport->reg_size);
                if (unlikely(!port->membase)) {
                        dev_err(port->dev, "can't remap port#%d\n", port->line);
                        return -ENXIO;
index b03d3e4..89154ac 100644 (file)
@@ -992,7 +992,7 @@ static void zs_release_port(struct uart_port *uport)
 static int zs_map_port(struct uart_port *uport)
 {
        if (!uport->membase)
-               uport->membase = ioremap_nocache(uport->mapbase,
+               uport->membase = ioremap(uport->mapbase,
                                                 ZS_CHAN_IO_SIZE);
        if (!uport->membase) {
                printk(KERN_ERR "zs: Cannot map MMIO\n");
index 84f26e4..0ca13f8 100644 (file)
@@ -4054,7 +4054,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                }
                info->lcr_mem_requested = true;
 
-               info->memory_base = ioremap_nocache(info->phys_memory_base,
+               info->memory_base = ioremap(info->phys_memory_base,
                                                                0x40000);
                if (!info->memory_base) {
                        printk( "%s(%d):Can't map shared memory on device %s MemAddr=%08X\n",
@@ -4068,7 +4068,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                        goto errout;
                }
                
-               info->lcr_base = ioremap_nocache(info->phys_lcr_base,
+               info->lcr_base = ioremap(info->phys_lcr_base,
                                                                PAGE_SIZE);
                if (!info->lcr_base) {
                        printk( "%s(%d):Can't map LCR memory on device %s MemAddr=%08X\n",
index e8a9047..e506fc4 100644 (file)
@@ -3450,7 +3450,7 @@ static int claim_resources(struct slgt_info *info)
        else
                info->reg_addr_requested = true;
 
-       info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);
+       info->reg_addr = ioremap(info->phys_reg_addr, SLGT_REG_SIZE);
        if (!info->reg_addr) {
                DBGERR(("%s can't map device registers, addr=%08X\n",
                        info->device_name, info->phys_reg_addr));
index fcb91bf..b9d9744 100644 (file)
@@ -3559,7 +3559,7 @@ static int claim_resources(SLMP_INFO *info)
        else
                info->sca_statctrl_requested = true;
 
-       info->memory_base = ioremap_nocache(info->phys_memory_base,
+       info->memory_base = ioremap(info->phys_memory_base,
                                                                SCA_MEM_SIZE);
        if (!info->memory_base) {
                printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n",
@@ -3568,7 +3568,7 @@ static int claim_resources(SLMP_INFO *info)
                goto errout;
        }
 
-       info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);
+       info->lcr_base = ioremap(info->phys_lcr_base, PAGE_SIZE);
        if (!info->lcr_base) {
                printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n",
                        __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
@@ -3577,7 +3577,7 @@ static int claim_resources(SLMP_INFO *info)
        }
        info->lcr_base += info->lcr_offset;
 
-       info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);
+       info->sca_base = ioremap(info->phys_sca_base, PAGE_SIZE);
        if (!info->sca_base) {
                printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n",
                        __FILE__,__LINE__,info->device_name, info->phys_sca_base );
@@ -3586,7 +3586,7 @@ static int claim_resources(SLMP_INFO *info)
        }
        info->sca_base += info->sca_offset;
 
-       info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,
+       info->statctrl_base = ioremap(info->phys_statctrl_base,
                                                                PAGE_SIZE);
        if (!info->statctrl_base) {
                printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n",
index 9ae2a7a..f0a2599 100644 (file)
@@ -222,7 +222,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                        retval = -EBUSY;
                        goto put_hcd;
                }
-               hcd->regs = devm_ioremap_nocache(&dev->dev, hcd->rsrc_start,
+               hcd->regs = devm_ioremap(&dev->dev, hcd->rsrc_start,
                                hcd->rsrc_len);
                if (hcd->regs == NULL) {
                        dev_dbg(&dev->dev, "error mapping memory\n");
index cac9911..971c6b9 100644 (file)
@@ -971,7 +971,7 @@ static int __init xdbc_init(void)
                goto free_and_quit;
        }
 
-       base = ioremap_nocache(xdbc.xhci_start, xdbc.xhci_length);
+       base = ioremap(xdbc.xhci_start, xdbc.xhci_length);
        if (!base) {
                xdbc_trace("failed to remap the io address\n");
                ret = -ENOMEM;
index 57b6f66..bfd1c9e 100644 (file)
@@ -116,7 +116,7 @@ static int udc_pci_probe(
                goto err_memreg;
        }
 
-       dev->virt_addr = ioremap_nocache(resource, len);
+       dev->virt_addr = ioremap(resource, len);
        if (!dev->virt_addr) {
                dev_dbg(&pdev->dev, "start address cannot be mapped\n");
                retval = -EFAULT;
index c372122..4a46f66 100644 (file)
@@ -1782,7 +1782,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
        dev->got_region = 1;
 
-       base = ioremap_nocache(resource, len);
+       base = ioremap(resource, len);
        if (base == NULL) {
                DBG(dev, "can't map memory\n");
                retval = -EFAULT;
index 247de0f..a8273b5 100644 (file)
@@ -2323,7 +2323,7 @@ net2272_rdk1_probe(struct pci_dev *pdev, struct net2272 *dev)
                        goto err;
                }
 
-               mem_mapped_addr[i] = ioremap_nocache(resource, len);
+               mem_mapped_addr[i] = ioremap(resource, len);
                if (mem_mapped_addr[i] == NULL) {
                        release_mem_region(resource, len);
                        dev_dbg(dev->dev, "can't map memory\n");
@@ -2401,7 +2401,7 @@ net2272_rdk2_probe(struct pci_dev *pdev, struct net2272 *dev)
                        goto err;
                }
 
-               mem_mapped_addr[i] = ioremap_nocache(resource, len);
+               mem_mapped_addr[i] = ioremap(resource, len);
                if (mem_mapped_addr[i] == NULL) {
                        release_mem_region(resource, len);
                        dev_dbg(dev->dev, "can't map memory\n");
@@ -2625,7 +2625,7 @@ net2272_plat_probe(struct platform_device *pdev)
                ret = -EBUSY;
                goto err;
        }
-       dev->base_addr = ioremap_nocache(base, len);
+       dev->base_addr = ioremap(base, len);
        if (!dev->base_addr) {
                dev_dbg(dev->dev, "can't map memory\n");
                ret = -EFAULT;
index 51efee2..1fd1b91 100644 (file)
@@ -3659,7 +3659,7 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         * 8051 code into the chip, e.g. to turn on PCI PM.
         */
 
-       base = ioremap_nocache(resource, len);
+       base = ioremap(resource, len);
        if (base == NULL) {
                ep_dbg(dev, "can't map memory\n");
                retval = -EFAULT;
index a2b610d..2d462fb 100644 (file)
@@ -107,7 +107,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
        if (!request_mem_region(res->start, res_len, "mab regs"))
                return -EBUSY;
 
-       dev->mab_regs = ioremap_nocache(res->start, res_len);
+       dev->mab_regs = ioremap(res->start, res_len);
        if (dev->mab_regs == NULL) {
                retval = -ENOMEM;
                goto err1;
@@ -124,7 +124,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
                retval = -EBUSY;
                goto err2;
        }
-       dev->usbid_regs = ioremap_nocache(res->start, res_len);
+       dev->usbid_regs = ioremap(res->start, res_len);
        if (dev->usbid_regs == NULL) {
                retval = -ENOMEM;
                goto err3;
@@ -178,7 +178,7 @@ int usb_hcd_msp_probe(const struct hc_driver *driver,
                retval = -EBUSY;
                goto err1;
        }
-       hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
+       hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
        if (!hcd->regs) {
                pr_debug("ioremap failed");
                retval = -ENOMEM;
index 6c7f0a8..beb2efa 100644 (file)
@@ -1150,7 +1150,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
        if (!mmio_resource_enabled(pdev, 0))
                return;
 
-       base = ioremap_nocache(pci_resource_start(pdev, 0), len);
+       base = ioremap(pci_resource_start(pdev, 0), len);
        if (base == NULL)
                return;
 
index 07cc82f..ccd30f8 100644 (file)
@@ -50,7 +50,7 @@ static int isp1761_pci_init(struct pci_dev *dev)
        }
 
        /* map available memory */
-       iobase = ioremap_nocache(mem_start, mem_length);
+       iobase = ioremap(mem_start, mem_length);
        if (!iobase) {
                printk(KERN_ERR "Error ioremap failed\n");
                release_mem_region(mem_start, mem_length);
@@ -101,7 +101,7 @@ static int isp1761_pci_init(struct pci_dev *dev)
                return -EBUSY;
        }
 
-       iobase = ioremap_nocache(mem_start, mem_length);
+       iobase = ioremap(mem_start, mem_length);
        if (!iobase) {
                printk(KERN_ERR "ioremap #1\n");
                release_mem_region(mem_start, mem_length);
index 4098513..80d6559 100644 (file)
@@ -161,7 +161,7 @@ static int intel_xhci_usb_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res)
                return -EINVAL;
-       data->base = devm_ioremap_nocache(dev, res->start, resource_size(res));
+       data->base = devm_ioremap(dev, res->start, resource_size(res));
        if (!data->base)
                return -ENOMEM;
 
index 3f17861..9fc4f33 100644 (file)
@@ -127,7 +127,7 @@ static int ucsi_acpi_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       /* This will make sure we can use ioremap_nocache() */
+       /* This will make sure we can use ioremap() */
        status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1);
        if (ACPI_FAILURE(status))
                return -ENOMEM;
index 0120d83..a879928 100644 (file)
@@ -230,7 +230,7 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf,
        switch ((u32)pos) {
        case 0xa0000 ... 0xbffff:
                count = min(count, (size_t)(0xc0000 - pos));
-               iomem = ioremap_nocache(0xa0000, 0xbffff - 0xa0000 + 1);
+               iomem = ioremap(0xa0000, 0xbffff - 0xa0000 + 1);
                off = pos - 0xa0000;
                rsrc = VGA_RSRC_LEGACY_MEM;
                is_ioport = false;
index 2d2babe..40d4fb9 100644 (file)
@@ -54,13 +54,13 @@ static int vfio_platform_amdxgbe_reset(struct vfio_platform_device *vdev)
 
        if (!xgmac_regs->ioaddr) {
                xgmac_regs->ioaddr =
-                       ioremap_nocache(xgmac_regs->addr, xgmac_regs->size);
+                       ioremap(xgmac_regs->addr, xgmac_regs->size);
                if (!xgmac_regs->ioaddr)
                        return -ENOMEM;
        }
        if (!xpcs_regs->ioaddr) {
                xpcs_regs->ioaddr =
-                       ioremap_nocache(xpcs_regs->addr, xpcs_regs->size);
+                       ioremap(xpcs_regs->addr, xpcs_regs->size);
                if (!xpcs_regs->ioaddr)
                        return -ENOMEM;
        }
index 16165a6..96064ef 100644 (file)
@@ -82,7 +82,7 @@ static int vfio_platform_bcmflexrm_reset(struct vfio_platform_device *vdev)
 
        /* Map FlexRM ring registers if not mapped */
        if (!reg->ioaddr) {
-               reg->ioaddr = ioremap_nocache(reg->addr, reg->size);
+               reg->ioaddr = ioremap(reg->addr, reg->size);
                if (!reg->ioaddr)
                        return -ENOMEM;
        }
index f67bab5..09a9453 100644 (file)
@@ -52,7 +52,7 @@ static int vfio_platform_calxedaxgmac_reset(struct vfio_platform_device *vdev)
 
        if (!reg->ioaddr) {
                reg->ioaddr =
-                       ioremap_nocache(reg->addr, reg->size);
+                       ioremap(reg->addr, reg->size);
                if (!reg->ioaddr)
                        return -ENOMEM;
        }
index e8f2bdb..c0771a9 100644 (file)
@@ -409,7 +409,7 @@ static ssize_t vfio_platform_read_mmio(struct vfio_platform_region *reg,
 
        if (!reg->ioaddr) {
                reg->ioaddr =
-                       ioremap_nocache(reg->addr, reg->size);
+                       ioremap(reg->addr, reg->size);
 
                if (!reg->ioaddr)
                        return -ENOMEM;
@@ -486,7 +486,7 @@ static ssize_t vfio_platform_write_mmio(struct vfio_platform_region *reg,
 
        if (!reg->ioaddr) {
                reg->ioaddr =
-                       ioremap_nocache(reg->addr, reg->size);
+                       ioremap(reg->addr, reg->size);
 
                if (!reg->ioaddr)
                        return -ENOMEM;
index 9f3be02..27ba2ed 100644 (file)
@@ -633,7 +633,7 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                ret = -EBUSY;
                goto err_free_hw;
        }
-       hw->v_regs = ioremap_nocache(carminefb_fix.mmio_start,
+       hw->v_regs = ioremap(carminefb_fix.mmio_start,
                        carminefb_fix.mmio_len);
        if (!hw->v_regs) {
                printk(KERN_ERR "carminefb: Can't remap %s register.\n",
@@ -664,7 +664,7 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                goto err_unmap_vregs;
        }
 
-       hw->screen_mem = ioremap_nocache(carminefb_fix.smem_start,
+       hw->screen_mem = ioremap(carminefb_fix.smem_start,
                        carminefb_fix.smem_len);
        if (!hw->screen_mem) {
                printk(KERN_ERR "carmine: Can't ioremap smem area.\n");
index d18f7b3..aa7583d 100644 (file)
@@ -1883,7 +1883,7 @@ static int i810_allocate_pci_resource(struct i810fb_par *par,
        }
        par->res_flags |= MMIO_REQ;
 
-       par->mmio_start_virtual = ioremap_nocache(par->mmio_start_phys, 
+       par->mmio_start_virtual = ioremap(par->mmio_start_phys, 
                                                  MMIO_SIZE);
        if (!par->mmio_start_virtual) {
                printk("i810fb_init: cannot remap mmio region\n");
index a76c615..a09fc2e 100644 (file)
@@ -654,7 +654,7 @@ static int intelfb_pci_register(struct pci_dev *pdev,
        }
 
        dinfo->mmio_base =
-               (u8 __iomem *)ioremap_nocache(dinfo->mmio_base_phys,
+               (u8 __iomem *)ioremap(dinfo->mmio_base_phys,
                                              INTEL_REG_SIZE);
        if (!dinfo->mmio_base) {
                ERR_MSG("Cannot remap MMIO region.\n");
index a7bd9f2..a866092 100644 (file)
@@ -683,7 +683,7 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        kyro_fix.mmio_len   = pci_resource_len(pdev, 1);
 
        currentpar->regbase = deviceInfo.pSTGReg =
-               ioremap_nocache(kyro_fix.mmio_start, kyro_fix.mmio_len);
+               ioremap(kyro_fix.mmio_start, kyro_fix.mmio_len);
        if (!currentpar->regbase)
                goto out_free_fb;
 
index 1a555f7..36cc718 100644 (file)
@@ -1710,7 +1710,7 @@ static int initMatrox2(struct matrox_fb_info *minfo, struct board *b)
                memsize = mem;
        err = -ENOMEM;
 
-       minfo->mmio.vbase.vaddr = ioremap_nocache(ctrlptr_phys, 16384);
+       minfo->mmio.vbase.vaddr = ioremap(ctrlptr_phys, 16384);
        if (!minfo->mmio.vbase.vaddr) {
                printk(KERN_ERR "matroxfb: cannot ioremap(%lX, 16384), matroxfb disabled\n", ctrlptr_phys);
                goto failVideoMR;
index 5093525..3de4b3e 100644 (file)
@@ -938,7 +938,7 @@ static int mbxfb_probe(struct platform_device *dev)
        }
        mfbi->reg_phys_addr = mfbi->reg_res->start;
 
-       mfbi->reg_virt_addr = devm_ioremap_nocache(&dev->dev,
+       mfbi->reg_virt_addr = devm_ioremap(&dev->dev,
                                                   mfbi->reg_phys_addr,
                                                   res_size(mfbi->reg_req));
        if (!mfbi->reg_virt_addr) {
@@ -948,7 +948,7 @@ static int mbxfb_probe(struct platform_device *dev)
        }
        virt_base_2700 = mfbi->reg_virt_addr;
 
-       mfbi->fb_virt_addr = devm_ioremap_nocache(&dev->dev, mfbi->fb_phys_addr,
+       mfbi->fb_virt_addr = devm_ioremap(&dev->dev, mfbi->fb_phys_addr,
                                                  res_size(mfbi->fb_req));
        if (!mfbi->fb_virt_addr) {
                dev_err(&dev->dev, "failed to ioremap frame buffer\n");
index 17174cd..974e4c2 100644 (file)
@@ -485,7 +485,7 @@ static int mmphw_probe(struct platform_device *pdev)
                goto failed;
        }
 
-       ctrl->reg_base = devm_ioremap_nocache(ctrl->dev,
+       ctrl->reg_base = devm_ioremap(ctrl->dev,
                        res->start, resource_size(res));
        if (ctrl->reg_base == NULL) {
                dev_err(ctrl->dev, "%s: res %pR map failed\n", __func__, res);
index 1dcf02e..7cc1216 100644 (file)
@@ -1563,7 +1563,7 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                goto err_exit_neither;
        }
        default_par->v_regs =
-               ioremap_nocache(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len);
+               ioremap(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len);
        if (!default_par->v_regs) {
                printk(KERN_WARNING "pm2fb: Can't remap %s register area.\n",
                       pm2fb_fix.id);
index 6130aa5..2fa4660 100644 (file)
@@ -1236,7 +1236,7 @@ static unsigned long pm3fb_size_memory(struct pm3_par *par)
                return 0;
        }
        screen_mem =
-               ioremap_nocache(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+               ioremap(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
        if (!screen_mem) {
                printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n");
                release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
@@ -1347,7 +1347,7 @@ static int pm3fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                goto err_exit_neither;
        }
        par->v_regs =
-               ioremap_nocache(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
+               ioremap(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
        if (!par->v_regs) {
                printk(KERN_WARNING "pm3fb: Can't remap %s register area.\n",
                        pm3fb_fix.id);
index d1e78ce..d5bf185 100644 (file)
@@ -188,7 +188,7 @@ static int pmagaafb_probe(struct device *dev)
 
        /* MMIO mapping setup. */
        info->fix.mmio_start = start + PMAG_AA_BT455_OFFSET;
-       par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+       par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
        if (!par->mmio) {
                printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
                err = -ENOMEM;
@@ -199,7 +199,7 @@ static int pmagaafb_probe(struct device *dev)
 
        /* Frame buffer mapping setup. */
        info->fix.smem_start = start + PMAG_AA_ONBOARD_FBMEM_OFFSET;
-       info->screen_base = ioremap_nocache(info->fix.smem_start,
+       info->screen_base = ioremap(info->fix.smem_start,
                                            info->fix.smem_len);
        if (!info->screen_base) {
                printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
index 56b912b..2ddcdf7 100644 (file)
@@ -180,7 +180,7 @@ static int pmagbafb_probe(struct device *dev)
 
        /* MMIO mapping setup.  */
        info->fix.mmio_start = start;
-       par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+       par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
        if (!par->mmio) {
                printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
                err = -ENOMEM;
@@ -190,7 +190,7 @@ static int pmagbafb_probe(struct device *dev)
 
        /* Frame buffer mapping setup.  */
        info->fix.smem_start = start + PMAG_BA_FBMEM;
-       info->screen_base = ioremap_nocache(info->fix.smem_start,
+       info->screen_base = ioremap(info->fix.smem_start,
                                            info->fix.smem_len);
        if (!info->screen_base) {
                printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
index 2822b22..90d2b04 100644 (file)
@@ -287,7 +287,7 @@ static int pmagbbfb_probe(struct device *dev)
 
        /* MMIO mapping setup.  */
        info->fix.mmio_start = start;
-       par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+       par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
        if (!par->mmio) {
                printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
                err = -ENOMEM;
@@ -298,7 +298,7 @@ static int pmagbbfb_probe(struct device *dev)
 
        /* Frame buffer mapping setup.  */
        info->fix.smem_start = start + PMAGB_B_FBMEM;
-       par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);
+       par->smem = ioremap(info->fix.smem_start, info->fix.smem_len);
        if (!par->smem) {
                printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
                err = -ENOMEM;
index 0a3b2b7..c680b3e 100644 (file)
@@ -770,7 +770,7 @@ static int __maybe_unused pvr2fb_common_init(void)
        struct pvr2fb_par *par = currentpar;
        unsigned long modememused, rev;
 
-       fb_info->screen_base = ioremap_nocache(pvr2_fix.smem_start,
+       fb_info->screen_base = ioremap(pvr2_fix.smem_start,
                                               pvr2_fix.smem_len);
 
        if (!fb_info->screen_base) {
@@ -778,7 +778,7 @@ static int __maybe_unused pvr2fb_common_init(void)
                goto out_err;
        }
 
-       par->mmio_base = ioremap_nocache(pvr2_fix.mmio_start,
+       par->mmio_base = ioremap(pvr2_fix.mmio_start,
                                         pvr2_fix.mmio_len);
        if (!par->mmio_base) {
                printk(KERN_ERR "pvr2fb: Failed to remap mmio space\n");
index 1410f47..5615054 100644 (file)
@@ -665,7 +665,7 @@ static int pxa168fb_probe(struct platform_device *pdev)
        /*
         * Map LCD controller registers.
         */
-       fbi->reg_base = devm_ioremap_nocache(&pdev->dev, res->start,
+       fbi->reg_base = devm_ioremap(&pdev->dev, res->start,
                                             resource_size(res));
        if (fbi->reg_base == NULL) {
                ret = -ENOMEM;
index e04efb5..8048499 100644 (file)
@@ -809,7 +809,7 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, info);
        default_par = info->par;
-       default_par->regs = ioremap_nocache(pdev->resource[1].start,
+       default_par->regs = ioremap(pdev->resource[1].start,
                        pdev->resource[1].end - pdev->resource[1].start +1);
        if (!default_par->regs) {
                printk(KERN_ERR PFX "unable to map registers\n");
@@ -818,7 +818,7 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
        }
        info->pseudo_palette = default_par->pseudo_palette;
 
-       info->screen_base = ioremap_nocache(pdev->resource[0].start,
+       info->screen_base = ioremap(pdev->resource[0].start,
                        pdev->resource[0].end - pdev->resource[0].start +1);
 
        if (!info->screen_base) {
index ab8fe83..f72b035 100644 (file)
@@ -463,7 +463,7 @@ static int sh7760fb_probe(struct platform_device *pdev)
                goto out_fb;
        }
 
-       par->base = ioremap_nocache(res->start, resource_size(res));
+       par->base = ioremap(res->start, resource_size(res));
        if (!par->base) {
                dev_err(&pdev->dev, "cannot remap\n");
                ret = -ENODEV;
index c249763..54ee7e0 100644 (file)
@@ -2588,7 +2588,7 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev)
        if (num_channels == 2)
                priv->forced_fourcc = pdata->ch[0].fourcc;
 
-       priv->base = ioremap_nocache(res->start, resource_size(res));
+       priv->base = ioremap(res->start, resource_size(res));
        if (!priv->base) {
                error = -ENOMEM;
                goto err1;
index 4e22ae3..1f171a5 100644 (file)
@@ -1363,14 +1363,14 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                goto fail_fb_mem;
        }
 
-       par->mmio_vbase = ioremap_nocache(fix->mmio_start,
+       par->mmio_vbase = ioremap(fix->mmio_start,
                                        fix->mmio_len);
        if (!par->mmio_vbase) {
                printk(KERN_ERR "sstfb: cannot remap register area %#lx\n",
                        fix->mmio_start);
                goto fail_mmio_remap;
        }
-       info->screen_base = ioremap_nocache(fix->smem_start, 0x400000);
+       info->screen_base = ioremap(fix->smem_start, 0x400000);
        if (!info->screen_base) {
                printk(KERN_ERR "sstfb: cannot remap framebuffer %#lx\n",
                        fix->smem_start);
index 9e88e3f..4670944 100644 (file)
@@ -1198,7 +1198,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
        case S9000_ID_TOMCAT:   /* Dual CRX, behaves else like a CRX */
                /* FIXME: TomCat supports two heads:
                 * fb.iobase = REGION_BASE(fb_info,3);
-                * fb.screen_base = ioremap_nocache(REGION_BASE(fb_info,2),xxx);
+                * fb.screen_base = ioremap(REGION_BASE(fb_info,2),xxx);
                 * for now we only support the left one ! */
                xres = fb->ngle_rom.x_size_visible;
                yres = fb->ngle_rom.y_size_visible;
@@ -1291,7 +1291,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
 
        strcpy(fix->id, "stifb");
        info->fbops = &stifb_ops;
-       info->screen_base = ioremap_nocache(REGION_BASE(fb,1), fix->smem_len);
+       info->screen_base = ioremap(REGION_BASE(fb,1), fix->smem_len);
        if (!info->screen_base) {
                printk(KERN_ERR "stifb: failed to map memory\n");
                goto out_err0;
index fdbb1ea..0337d1a 100644 (file)
@@ -1417,7 +1417,7 @@ static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        default_par->regbase_virt =
-               ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+               ioremap(info->fix.mmio_start, info->fix.mmio_len);
        if (!default_par->regbase_virt) {
                printk(KERN_ERR "fb: Can't remap %s register area.\n",
                                info->fix.id);
index 286b237..1966f1d 100644 (file)
@@ -1438,7 +1438,7 @@ static int tgafb_register(struct device *dev)
        }
 
        /* Map the framebuffer.  */
-       mem_base = ioremap_nocache(bar0_start, bar0_len);
+       mem_base = ioremap(bar0_start, bar0_len);
        if (!mem_base) {
                printk(KERN_ERR "tgafb: Cannot map MMIO\n");
                goto err1;
index da74bf6..91b2f6c 100644 (file)
@@ -1556,7 +1556,7 @@ static int trident_pci_probe(struct pci_dev *dev,
                return -1;
        }
 
-       default_par->io_virt = ioremap_nocache(tridentfb_fix.mmio_start,
+       default_par->io_virt = ioremap(tridentfb_fix.mmio_start,
                                               tridentfb_fix.mmio_len);
 
        if (!default_par->io_virt) {
@@ -1579,7 +1579,7 @@ static int trident_pci_probe(struct pci_dev *dev,
                goto out_unmap1;
        }
 
-       info->screen_base = ioremap_nocache(tridentfb_fix.smem_start,
+       info->screen_base = ioremap(tridentfb_fix.smem_start,
                                            tridentfb_fix.smem_len);
 
        if (!info->screen_base) {
index e04fde9..97a59b5 100644 (file)
@@ -356,7 +356,7 @@ int __init valkyriefb_init(void)
        p->total_vram = 0x100000;
        p->frame_buffer_phys = frame_buffer_phys;
 #ifdef CONFIG_MAC
-       p->frame_buffer = ioremap_nocache(frame_buffer_phys, p->total_vram);
+       p->frame_buffer = ioremap(frame_buffer_phys, p->total_vram);
 #else
        p->frame_buffer = ioremap_wt(frame_buffer_phys, p->total_vram);
 #endif
index c1e3738..79d42b2 100644 (file)
@@ -159,7 +159,7 @@ static int __init cr_pll_init(void)
        pci_read_config_dword(mch_dev, CRVML_REG_MCHBAR,
                              &mch_bar);
        mch_regs_base =
-           ioremap_nocache(mch_bar, CRVML_MCHMAP_SIZE);
+           ioremap(mch_bar, CRVML_MCHMAP_SIZE);
        if (!mch_regs_base) {
                printk(KERN_ERR
                       "Carillo Ranch MCH device was not enabled.\n");
index 498038a..ff61605 100644 (file)
@@ -317,7 +317,7 @@ static int vmlfb_enable_mmio(struct vml_par *par)
                       ": Could not claim display controller MMIO.\n");
                return -EBUSY;
        }
-       par->vdc_mem = ioremap_nocache(par->vdc_mem_base, par->vdc_mem_size);
+       par->vdc_mem = ioremap(par->vdc_mem_base, par->vdc_mem_size);
        if (par->vdc_mem == NULL) {
                printk(KERN_ERR MODULE_NAME
                       ": Could not map display controller MMIO.\n");
@@ -332,7 +332,7 @@ static int vmlfb_enable_mmio(struct vml_par *par)
                err = -EBUSY;
                goto out_err_1;
        }
-       par->gpu_mem = ioremap_nocache(par->gpu_mem_base, par->gpu_mem_size);
+       par->gpu_mem = ioremap(par->gpu_mem_base, par->gpu_mem_size);
        if (par->gpu_mem == NULL) {
                printk(KERN_ERR MODULE_NAME ": Could not map GPU MMIO.\n");
                err = -ENOMEM;
index ffa2ca2..703ddee 100644 (file)
@@ -442,7 +442,7 @@ static int via_pci_setup_mmio(struct viafb_dev *vdev)
         */
        vdev->engine_start = pci_resource_start(vdev->pdev, 1);
        vdev->engine_len = pci_resource_len(vdev->pdev, 1);
-       vdev->engine_mmio = ioremap_nocache(vdev->engine_start,
+       vdev->engine_mmio = ioremap(vdev->engine_start,
                        vdev->engine_len);
        if (vdev->engine_mmio == NULL)
                dev_err(&vdev->pdev->dev,
index 3be0780..0796b1d 100644 (file)
@@ -648,12 +648,12 @@ int w100fb_probe(struct platform_device *pdev)
                return -EINVAL;
 
        /* Remap the chip base address */
-       remapped_base = ioremap_nocache(mem->start+W100_CFG_BASE, W100_CFG_LEN);
+       remapped_base = ioremap(mem->start+W100_CFG_BASE, W100_CFG_LEN);
        if (remapped_base == NULL)
                goto out;
 
        /* Map the register space */
-       remapped_regs = ioremap_nocache(mem->start+W100_REG_BASE, W100_REG_LEN);
+       remapped_regs = ioremap(mem->start+W100_REG_BASE, W100_REG_LEN);
        if (remapped_regs == NULL)
                goto out;
 
@@ -672,7 +672,7 @@ int w100fb_probe(struct platform_device *pdev)
        printk(" at 0x%08lx.\n", (unsigned long) mem->start+W100_CFG_BASE);
 
        /* Remap the framebuffer */
-       remapped_fbuf = ioremap_nocache(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);
+       remapped_fbuf = ioremap(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);
        if (remapped_fbuf == NULL)
                goto out;
 
index 1b6e42e..51e056b 100644 (file)
@@ -55,7 +55,7 @@ static int vmic_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        /* Map registers in BAR 0 */
-       vmic_base = ioremap_nocache(pci_resource_start(pdev, 0), 16);
+       vmic_base = ioremap(pci_resource_start(pdev, 0), 16);
        if (!vmic_base) {
                dev_err(&pdev->dev, "Unable to remap CRG region\n");
                retval = -EIO;
index 1edb8a5..ea938dc 100644 (file)
@@ -554,7 +554,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
                goto err_resource;
        }
 
-       image->kern_base = ioremap_nocache(
+       image->kern_base = ioremap(
                image->bus_resource.start, size);
        if (!image->kern_base) {
                dev_err(ca91cx42_bridge->parent, "Failed to remap resource\n");
@@ -1638,7 +1638,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        /* map registers in BAR 0 */
-       ca91cx42_device->base = ioremap_nocache(pci_resource_start(pdev, 0),
+       ca91cx42_device->base = ioremap(pci_resource_start(pdev, 0),
                4096);
        if (!ca91cx42_device->base) {
                dev_err(&pdev->dev, "Unable to remap CRG region\n");
index 7e079d3..50ae269 100644 (file)
@@ -770,7 +770,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
                goto err_resource;
        }
 
-       image->kern_base = ioremap_nocache(
+       image->kern_base = ioremap(
                image->bus_resource.start, size);
        if (!image->kern_base) {
                dev_err(tsi148_bridge->parent, "Failed to remap resource\n");
@@ -2317,7 +2317,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        /* map registers in BAR 0 */
-       tsi148_device->base = ioremap_nocache(pci_resource_start(pdev, 0),
+       tsi148_device->base = ioremap(pci_resource_start(pdev, 0),
                4096);
        if (!tsi148_device->base) {
                dev_err(&pdev->dev, "Unable to remap CRG region\n");
index 3110791..ee716c7 100644 (file)
@@ -139,7 +139,7 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent
 
        dev->phys_addr = pci_resource_start(pdev, 1);
 
-       dev->virt_addr = ioremap_nocache(dev->phys_addr, 16384);
+       dev->virt_addr = ioremap(dev->phys_addr, 16384);
        if (!dev->virt_addr) {
                dev_err(&pdev->dev, "%s: failed to ioremap(0x%lx, %d).\n",
                        __func__, dev->phys_addr, 16384);
index 8a043b5..7cdb253 100644 (file)
@@ -246,7 +246,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       bcm63xx_wdt_device.regs = devm_ioremap_nocache(&pdev->dev, r->start,
+       bcm63xx_wdt_device.regs = devm_ioremap(&pdev->dev, r->start,
                                                        resource_size(r));
        if (!bcm63xx_wdt_device.regs) {
                dev_err(&pdev->dev, "failed to remap I/O resources\n");
index 6ad5bf3..804e359 100644 (file)
@@ -463,7 +463,7 @@ static int __init intel_scu_watchdog_init(void)
                return -ENODEV;
        }
 
-       tmp_addr = ioremap_nocache(watchdog_device.timer_tbl_ptr->phys_addr,
+       tmp_addr = ioremap(watchdog_device.timer_tbl_ptr->phys_addr,
                        20);
 
        if (tmp_addr == NULL) {
index 1dfede0..aee3c2e 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>     /* For platform_driver framework */
 #include <linux/spinlock.h>            /* For spin_lock/spin_unlock/... */
 #include <linux/uaccess.h>             /* For copy_to_user/put_user/... */
-#include <linux/io.h>                  /* For devm_ioremap_nocache */
+#include <linux/io.h>                  /* For devm_ioremap */
 
 #include <asm/mach-rc32434/integ.h>    /* For the Watchdog registers */
 
@@ -267,7 +267,7 @@ static int rc32434_wdt_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       wdt_reg = devm_ioremap_nocache(&pdev->dev, r->start, resource_size(r));
+       wdt_reg = devm_ioremap(&pdev->dev, r->start, resource_size(r));
        if (!wdt_reg) {
                pr_err("failed to remap I/O resources\n");
                return -ENXIO;
index 325fc98..d39ac99 100644 (file)
@@ -960,10 +960,6 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size)
 }
 #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */
 
-#ifndef ioremap_nocache
-#define ioremap_nocache ioremap
-#endif
-
 #ifndef ioremap_wc
 #define ioremap_wc ioremap
 #endif
index a008f50..9d28a5e 100644 (file)
@@ -94,11 +94,11 @@ extern void ioport_unmap(void __iomem *);
 #endif
 
 #ifndef ARCH_HAS_IOREMAP_WC
-#define ioremap_wc ioremap_nocache
+#define ioremap_wc ioremap
 #endif
 
 #ifndef ARCH_HAS_IOREMAP_WT
-#define ioremap_wt ioremap_nocache
+#define ioremap_wt ioremap
 #endif
 
 #ifdef CONFIG_PCI
index a59834b..b1c44bb 100644 (file)
@@ -66,8 +66,6 @@ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
                           resource_size_t size);
 void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
                                   resource_size_t size);
-void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
-                                  resource_size_t size);
 void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,
                                   resource_size_t size);
 void devm_iounmap(struct device *dev, void __iomem *addr);
@@ -87,7 +85,7 @@ void *__devm_memremap_pages(struct device *dev, struct resource *res);
  * Posting") mandate non-posted configuration transactions. There is
  * no ioremap API in the kernel that can guarantee non-posted write
  * semantics across arches so provide a default implementation for
- * mapping PCI config space that defaults to ioremap_nocache(); arches
+ * mapping PCI config space that defaults to ioremap(); arches
  * should override it if they have memory mapping implementations that
  * guarantee non-posted writes semantics to make the memory mapping
  * compliant with the PCI specification.
@@ -97,7 +95,7 @@ void *__devm_memremap_pages(struct device *dev, struct resource *res);
 static inline void __iomem *pci_remap_cfgspace(phys_addr_t offset,
                                               size_t size)
 {
-       return ioremap_nocache(offset, size);
+       return ioremap(offset, size);
 }
 #endif
 #endif
index f56070c..6ef51f1 100644 (file)
@@ -8,7 +8,6 @@
 
 enum devm_ioremap_type {
        DEVM_IOREMAP = 0,
-       DEVM_IOREMAP_NC,
        DEVM_IOREMAP_UC,
        DEVM_IOREMAP_WC,
 };
@@ -37,9 +36,6 @@ static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset,
        case DEVM_IOREMAP:
                addr = ioremap(offset, size);
                break;
-       case DEVM_IOREMAP_NC:
-               addr = ioremap_nocache(offset, size);
-               break;
        case DEVM_IOREMAP_UC:
                addr = ioremap_uc(offset, size);
                break;
@@ -88,22 +84,6 @@ void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
 EXPORT_SYMBOL_GPL(devm_ioremap_uc);
 
 /**
- * devm_ioremap_nocache - Managed ioremap_nocache()
- * @dev: Generic device to remap IO address for
- * @offset: Resource address to map
- * @size: Size of map
- *
- * Managed ioremap_nocache().  Map is automatically unmapped on driver
- * detach.
- */
-void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
-                                  resource_size_t size)
-{
-       return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_NC);
-}
-EXPORT_SYMBOL(devm_ioremap_nocache);
-
-/**
  * devm_ioremap_wc - Managed ioremap_wc()
  * @dev: Generic device to remap IO address for
  * @offset: Resource address to map
index 441799b..9330d42 100644 (file)
@@ -52,8 +52,6 @@ expression x;
 |
  x = devm_ioremap(...)
 |
- x = devm_ioremap_nocache(...)
-|
  x = devm_ioport_map(...)
 )
 
@@ -85,8 +83,6 @@ position p;
 |
  x = ioremap(...)
 |
- x = ioremap_nocache(...)
-|
  x = ioport_map(...)
 )
 ...
index 0e60e11..63b81d0 100644 (file)
@@ -23,7 +23,7 @@ int ret;
 position p1,p2,p3;
 @@
 
-e = \(ioremap@p1\|ioremap_nocache@p1\)(...)
+e = \(ioremap@p1\)(...)
 ... when != iounmap(e)
 if (<+...e...+>) S
 ... when any
index 70a6d18..db1295f 100644 (file)
@@ -1123,7 +1123,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
        PDEBUG(INIT_INFO, "Trying to reserve resources now ...\n");
        resource = platform_get_resource(pfdev, IORESOURCE_MEM, 0);
        /* get "port" */
-       ml403_ac97cr->port = ioremap_nocache(resource->start,
+       ml403_ac97cr->port = ioremap(resource->start,
                                             (resource->end) -
                                             (resource->start) + 1);
        if (ml403_ac97cr->port == NULL) {
index e435ebd..f15fe59 100644 (file)
@@ -551,7 +551,7 @@ static int snd_msnd_attach(struct snd_card *card)
                free_irq(chip->irq, chip);
                return -EBUSY;
        }
-       chip->mappedbase = ioremap_nocache(chip->base, 0x8000);
+       chip->mappedbase = ioremap(chip->base, 0x8000);
        if (!chip->mappedbase) {
                printk(KERN_ERR LOGNAME
                        ": unable to map memory region 0x%lx-0x%lx\n",
index 6acc59c..0d1eced 100644 (file)
@@ -907,7 +907,7 @@ snd_harmony_create(struct snd_card *card,
        h->card = card;
        h->dev = padev;
        h->irq = -1;
-       h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE);
+       h->iobase = ioremap(padev->hpa.start, HARMONY_SIZE);
        if (h->iobase == NULL) {
                printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",
                       (unsigned long)padev->hpa.start);
index 1cbfae8..459c169 100644 (file)
@@ -271,7 +271,7 @@ static int snd_aw2_create(struct snd_card *card,
        }
        chip->iobase_phys = pci_resource_start(pci, 0);
        chip->iobase_virt =
-               ioremap_nocache(chip->iobase_phys,
+               ioremap(chip->iobase_phys,
                                pci_resource_len(pci, 0));
 
        if (chip->iobase_virt == NULL) {
index 102a629..1465d7a 100644 (file)
@@ -3983,7 +3983,7 @@ int snd_cs46xx_create(struct snd_card *card,
                        snd_cs46xx_free(chip);
                        return -EBUSY;
                }
-               region->remap_addr = ioremap_nocache(region->base, region->size);
+               region->remap_addr = ioremap(region->base, region->size);
                if (region->remap_addr == NULL) {
                        dev_err(chip->card->dev,
                                "%s ioremap problem\n", region->name);
index 1465813..dfd5541 100644 (file)
@@ -1929,7 +1929,7 @@ static int snd_echo_create(struct snd_card *card,
                return -EBUSY;
        }
        chip->dsp_registers = (volatile u32 __iomem *)
-               ioremap_nocache(chip->dsp_registers_phys, sz);
+               ioremap(chip->dsp_registers_phys, sz);
        if (!chip->dsp_registers) {
                dev_err(chip->card->dev, "ioremap failed\n");
                snd_echo_free(chip);
index 1201c9c..77c683d 100644 (file)
@@ -1353,7 +1353,7 @@ snd_nm256_peek_for_sig(struct nm256 *chip)
        unsigned long pointer_found = chip->buffer_end - 0x1400;
        u32 sig;
 
-       temp = ioremap_nocache(chip->buffer_addr + chip->buffer_end - 0x400, 16);
+       temp = ioremap(chip->buffer_addr + chip->buffer_end - 0x400, 16);
        if (temp == NULL) {
                dev_err(chip->card->dev,
                        "Unable to scan for card signature in video RAM\n");
@@ -1518,7 +1518,7 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
                err = -EBUSY;
                goto __error;
        }
-       chip->cport = ioremap_nocache(chip->cport_addr, NM_PORT2_SIZE);
+       chip->cport = ioremap(chip->cport_addr, NM_PORT2_SIZE);
        if (chip->cport == NULL) {
                dev_err(card->dev, "unable to map control port %lx\n",
                        chip->cport_addr);
@@ -1589,7 +1589,7 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
                err = -EBUSY;
                goto __error;
        }
-       chip->buffer = ioremap_nocache(chip->buffer_addr, chip->buffer_size);
+       chip->buffer = ioremap(chip->buffer_addr, chip->buffer_size);
        if (chip->buffer == NULL) {
                err = -ENOMEM;
                dev_err(card->dev, "unable to map ring buffer at %lx\n",
index 58a4b8d..4a238de 100644 (file)
@@ -1344,7 +1344,7 @@ static int snd_rme32_create(struct rme32 *rme32)
                return err;
        rme32->port = pci_resource_start(rme32->pci, 0);
 
-       rme32->iobase = ioremap_nocache(rme32->port, RME32_IO_SIZE);
+       rme32->iobase = ioremap(rme32->port, RME32_IO_SIZE);
        if (!rme32->iobase) {
                dev_err(rme32->card->dev,
                        "unable to remap memory region 0x%lx-0x%lx\n",
index 64ab557..db60330 100644 (file)
@@ -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",
index cd20af4..dfb0654 100644 (file)
@@ -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;
index 75c06a7..e2214ba 100644 (file)
@@ -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);
index ef5c2f8..bb91307 100644 (file)
@@ -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);
index ef7dd29..ce13dcd 100644 (file)
@@ -1334,7 +1334,7 @@ static int sis_chip_create(struct snd_card *card,
        }
 
        rc = -EIO;
-       sis->ioaddr = ioremap_nocache(pci_resource_start(pci, 1), 0x4000);
+       sis->ioaddr = ioremap(pci_resource_start(pci, 1), 0x4000);
        if (!sis->ioaddr) {
                dev_err(&pci->dev, "unable to remap MMIO, aborting\n");
                goto error_out_cleanup;
index 125c11e..d390781 100644 (file)
@@ -2373,7 +2373,7 @@ int snd_ymfpci_create(struct snd_card *card,
        chip->device_id = pci->device;
        chip->rev = pci->revision;
        chip->reg_area_phys = pci_resource_start(pci, 0);
-       chip->reg_area_virt = ioremap_nocache(chip->reg_area_phys, 0x8000);
+       chip->reg_area_virt = ioremap(chip->reg_area_phys, 0x8000);
        pci_set_master(pci);
        chip->src441_used = -1;
 
index 0792c40..d283021 100644 (file)
@@ -248,7 +248,7 @@ static int au1xac97c_drvprobe(struct platform_device *pdev)
                                     pdev->name))
                return -EBUSY;
 
-       ctx->mmio = devm_ioremap_nocache(&pdev->dev, iores->start,
+       ctx->mmio = devm_ioremap(&pdev->dev, iores->start,
                                         resource_size(iores));
        if (!ctx->mmio)
                return -EBUSY;
index 46f2b44..7fd08fa 100644 (file)
@@ -248,7 +248,7 @@ static int au1xi2s_drvprobe(struct platform_device *pdev)
                                     pdev->name))
                return -EBUSY;
 
-       ctx->mmio = devm_ioremap_nocache(&pdev->dev, iores->start,
+       ctx->mmio = devm_ioremap(&pdev->dev, iores->start,
                                         resource_size(iores));
        if (!ctx->mmio)
                return -EBUSY;
index b728fb5..f3cfe83 100644 (file)
@@ -165,7 +165,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
        ctx->iram_base = rsrc->start + ctx->pdata->res_info->iram_offset;
        ctx->iram_end =  ctx->iram_base + ctx->pdata->res_info->iram_size - 1;
        dev_info(ctx->dev, "IRAM base: %#x", ctx->iram_base);
-       ctx->iram = devm_ioremap_nocache(ctx->dev, ctx->iram_base,
+       ctx->iram = devm_ioremap(ctx->dev, ctx->iram_base,
                                         ctx->pdata->res_info->iram_size);
        if (!ctx->iram) {
                dev_err(ctx->dev, "unable to map IRAM\n");
@@ -175,7 +175,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
        ctx->dram_base = rsrc->start + ctx->pdata->res_info->dram_offset;
        ctx->dram_end = ctx->dram_base + ctx->pdata->res_info->dram_size - 1;
        dev_info(ctx->dev, "DRAM base: %#x", ctx->dram_base);
-       ctx->dram = devm_ioremap_nocache(ctx->dev, ctx->dram_base,
+       ctx->dram = devm_ioremap(ctx->dev, ctx->dram_base,
                                         ctx->pdata->res_info->dram_size);
        if (!ctx->dram) {
                dev_err(ctx->dev, "unable to map DRAM\n");
@@ -184,7 +184,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
 
        ctx->shim_phy_add = rsrc->start + ctx->pdata->res_info->shim_offset;
        dev_info(ctx->dev, "SHIM base: %#x", ctx->shim_phy_add);
-       ctx->shim = devm_ioremap_nocache(ctx->dev, ctx->shim_phy_add,
+       ctx->shim = devm_ioremap(ctx->dev, ctx->shim_phy_add,
                                        ctx->pdata->res_info->shim_size);
        if (!ctx->shim) {
                dev_err(ctx->dev, "unable to map SHIM\n");
@@ -197,7 +197,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
        /* Get mailbox addr */
        ctx->mailbox_add = rsrc->start + ctx->pdata->res_info->mbox_offset;
        dev_info(ctx->dev, "Mailbox base: %#x", ctx->mailbox_add);
-       ctx->mailbox = devm_ioremap_nocache(ctx->dev, ctx->mailbox_add,
+       ctx->mailbox = devm_ioremap(ctx->dev, ctx->mailbox_add,
                                            ctx->pdata->res_info->mbox_size);
        if (!ctx->mailbox) {
                dev_err(ctx->dev, "unable to map mailbox\n");
@@ -216,7 +216,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
        ctx->ddr_base = rsrc->start;
        ctx->ddr_end = rsrc->end;
        dev_info(ctx->dev, "DDR base: %#x", ctx->ddr_base);
-       ctx->ddr = devm_ioremap_nocache(ctx->dev, ctx->ddr_base,
+       ctx->ddr = devm_ioremap(ctx->dev, ctx->ddr_base,
                                        resource_size(rsrc));
        if (!ctx->ddr) {
                dev_err(ctx->dev, "unable to map DDR\n");
index e384fdc..2ead52b 100644 (file)
@@ -1955,7 +1955,7 @@ static int fsi_probe(struct platform_device *pdev)
        if (!master)
                return -ENOMEM;
 
-       master->base = devm_ioremap_nocache(&pdev->dev,
+       master->base = devm_ioremap(&pdev->dev,
                                            res->start, resource_size(res));
        if (!master->base) {
                dev_err(&pdev->dev, "Unable to ioremap FSI registers.\n");
index cd389d2..cf258dd 100644 (file)
@@ -1755,7 +1755,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
                __func__, (unsigned int)res_mmio->start,
                (unsigned int)res_mmio->end);
 
-       card_ctx->mmio_start = ioremap_nocache(res_mmio->start,
+       card_ctx->mmio_start = ioremap(res_mmio->start,
                                               (size_t)(resource_size(res_mmio)));
        if (!card_ctx->mmio_start) {
                dev_err(&pdev->dev, "Could not get ioremap\n");
index 6aca8d5..dbebf05 100644 (file)
@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
 ldflags-y += --wrap=ioremap_wc
 ldflags-y += --wrap=memremap
-ldflags-y += --wrap=devm_ioremap_nocache
+ldflags-y += --wrap=devm_ioremap
 ldflags-y += --wrap=devm_memremap
 ldflags-y += --wrap=devm_memunmap
-ldflags-y += --wrap=ioremap_nocache
 ldflags-y += --wrap=ioremap
 ldflags-y += --wrap=iounmap
 ldflags-y += --wrap=memunmap
index 6271ac7..03e40b3 100644 (file)
@@ -73,7 +73,7 @@ void __iomem *__nfit_test_ioremap(resource_size_t offset, unsigned long size,
        return fallback_fn(offset, size);
 }
 
-void __iomem *__wrap_devm_ioremap_nocache(struct device *dev,
+void __iomem *__wrap_devm_ioremap(struct device *dev,
                resource_size_t offset, unsigned long size)
 {
        struct nfit_test_resource *nfit_res = get_nfit_res(offset);
@@ -81,9 +81,9 @@ void __iomem *__wrap_devm_ioremap_nocache(struct device *dev,
        if (nfit_res)
                return (void __iomem *) nfit_res->buf + offset
                        - nfit_res->res.start;
-       return devm_ioremap_nocache(dev, offset, size);
+       return devm_ioremap(dev, offset, size);
 }
-EXPORT_SYMBOL(__wrap_devm_ioremap_nocache);
+EXPORT_SYMBOL(__wrap_devm_ioremap);
 
 void *__wrap_devm_memremap(struct device *dev, resource_size_t offset,
                size_t size, unsigned long flags)
@@ -187,12 +187,6 @@ void __wrap_devm_memunmap(struct device *dev, void *addr)
 }
 EXPORT_SYMBOL(__wrap_devm_memunmap);
 
-void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size)
-{
-       return __nfit_test_ioremap(offset, size, ioremap_nocache);
-}
-EXPORT_SYMBOL(__wrap_ioremap_nocache);
-
 void __iomem *__wrap_ioremap(resource_size_t offset, unsigned long size)
 {
        return __nfit_test_ioremap(offset, size, ioremap);
index 0bf5640..db3c07b 100644 (file)
@@ -207,8 +207,6 @@ typedef struct nfit_test_resource *(*nfit_test_lookup_fn)(resource_size_t);
 typedef union acpi_object *(*nfit_test_evaluate_dsm_fn)(acpi_handle handle,
                 const guid_t *guid, u64 rev, u64 func,
                 union acpi_object *argv4);
-void __iomem *__wrap_ioremap_nocache(resource_size_t offset,
-               unsigned long size);
 void __wrap_iounmap(volatile void __iomem *addr);
 void nfit_test_setup(nfit_test_lookup_fn lookup,
                nfit_test_evaluate_dsm_fn evaluate);