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 13046fcf0a5da7c98f92631e69b8eb295b2fa319..20e07e40be020318e7ed15bc5be93a51e3f53a90 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 f169d58ca019a30f212c81e93c3f1a64b55802cf..ddef812ddf8fb429762156ef6008113e8ab50641 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 9a298fd97d74a41b12af0b302ac18f3819ed116e..5d901771016d2a003b59b6e9366386e32c126a75 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 1989b946a28dd2b0ed6f937457f5914d2a9ff5d9..d1ed5a8133c5df21e357bd4aae2ecc9f53b8f1a1 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 aefdabdbeb8486ca3a610977c0e75c5f852f2be2..ab2b654084fa33151c4df80b3f65ed0076e1852a 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 21400b3fa5fe88444a60ca24f58560e40a3a609e..c9db2a9006d95d4d97254a413af22cb48cead22c 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 3e447d4688458b31fe994be4b0a3954802f312b4..e650131ee88f06aadc24f5cf3ff60f9253ff2e44 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 e1a394ac3eea7c4a28be5b23ffa874e2d86f8e65..868dc0cf4859f2debe5b0bedf8d189726aa8fd1e 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 96330ef256416dce9c3d310dcef6c2ccb06450bc..e771ce70e132ff535962f2af51727105f72b5fc0 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 e84599dd96f1a2d2b83eaa2fba2dcc9528df0874..672081405a7ed7aaf579d66c236970457a589d1f 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 787d039b5a073863c2e655f6ee779c201b2f42d1..f760c27c99074a02f19bd31368d0f474d6bc10b8 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 ce51794f64c7b1dd4a00cbfa5b420251c1fdb581..2bc93f391bcf8e5d4142ed2855b661eac32e4778 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 b0dbc347317240ca26a73cc422d4ced3154b1e08..bda2a9c2df78894f52d60e505fea72403816b126 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 30cb373f3de8a3c3602c6a9495421edb2e639303..64ce0b971a0a1df07417a514e8031e62522ae67a 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 f80eb7fb544d71f80ff852c6333d6cdd7fb22a5c..258d7b70c0f38534cb9f8ff8ccaa0e1e8827fa53 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 559cb91bede11c8ce1b88dc5a1d41f188550765e..dec05743d426513901fe509c6c94a05c0fb45b01 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 7de162432d7f670d63647038d013a545fb0a64a3..95def949c9714597fe9d6330d46e81c33b37807d 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 2292e55c12e23c00435271934caf67e7da7045b1..8b006addd6ba524a3bc33e641669fe6b5ced8b62 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 1f2028266493c3768735193b94b4b516884317e8..215149a85d83ba44b2538d77909108956a4e6475 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 8da996142d6a04c5336549c65a8b578142dbd783..24f619199ee76447859683e2857d0c20f59c062f 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 acd55a9cffe3ecce5a7c6b03dab67c8adcc8b8d1..47f3e98974fc63f85bcccc1228a76ef8d6501449 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 989e71015ee67ce30eafe26c6f76ab8955c42ebb..cb99f97399102fa77a22aa877bae2ed7c6f70760 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 63eacb8b0eb5b77a3f6a8d1e8cd7979e185d69a8..137abbc65c60d1c98ca8f63d6f7544877cc66cb7 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 ea385a865781fce391e332fb865ba2509265539b..484ee28922a9ac3f2509a3a958a23cb02008128b 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 1f742c32a883bbef7cfb2fd7ebb41c8fbac25860..4f34d92b52f9828f9cd5e5ba73bace306d8ff825 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 06d92fb377699a74487c3b60227916153890b487..c238e95190acf914d3fec973140c7a0e9b1764df 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 d9caa811a2fa7fed3a37db3e82a68d096a87ea75..cf1f2a4a241898317d1c622a9af115e914bad4f4 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 e5ea3db23d6b4acd6cfcb672bdc70f33c2307d04..cdb93ed91cdec8f229ac60324e83a9345a1402aa 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 69e3e0b556bf7fd9bcd3533c3e7c2502e8224b45..8d2535123f11c8f31bdb87c95e09dc165e18864b 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 037b08f3257e0a4e93b2f33f22463919a2a566fc..42222f849bd25d2d63ee9d42413d3d94cd34f799 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 115b417dfb8e3a5c1544db506024314619a1a607..df8eed3875f6d41992292e22381841dc4ca2cdad 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 156a95ac5c7256e95febf6cf2f22f26fad267224..aa37545ebe8f72d73cd5e9281342695ef05ae553 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 e7c87161ce0033b2b77db8ad2a26d5ce863d6a44..e49c406469951cff56c45ec46108024d6aaa291f 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 73dd251424843c1f343b6e609a9d72023ab8be09..fd76114fa3b0a526a55007dc2b32526abf45a227 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 6c36a414dde71a6bc12e4377226d9ad37115133a..0c7399b303fbe7b073929ec4f7f181f0ec4c5619 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 f97662045c73c8c1d17b6d6f4bafe454cf13b6d3..4cc73f7ac0d406c08799ec1722a5522e55c4035e 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 88b3bd5fed257978f5d1162bb73c4854ab852e20..bc7671079f0c62f701bd0aa61a3c0aa91dc020e4 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 98a063093b69aac2d66f782736125d62cddf41b1..0ddf03df626881d34293e7aea7bd8cd73a32f646 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 4f2411f489afbc2bd7b481dae87bcc4e1a048d57..01a2af8215c8d1746748eff19703036ec8674d97 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 0fed6fc17fe4090e40b3422a1316d1e6c4ec8d70..490953f515282af4776efb371dedfc72667b3335 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 151d9b5870bb70a4553ed3a5fc2574fd59986473..5548365605c02faa5d82d2b506aedd72b08ff24b 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 c9f4d4ba058aa8632b8d7435a106c4d620b1a3f0..e1f12e39813634ae8f9ecff13c0aff0cad1d6c82 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 8c236738b5ee300cc299f7bb848f5ea04501e030..25372e62783b584456162362d6765aca7a73b829 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 504e6ab399b5b63b636de37ac725638f424095dc..f2822632b017350ba067f9b833c13a0378bebf6d 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 8e6e8db8dd5fa46e2749172c357d328968ddff09..940c684f692148290f8563d1363b66223fb8c446 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 c945d76cfce52dc81cc7083ae96aef9284dcdb51..220ca0cd7945e218942fe6d97c3972389d2a32b1 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 59b23095bfbb422c97ac0b506576dd94ce0de769..90c6d4a11c5d1c027b35a62db5aaa202e456d8d8 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 c9ecf17f866055b3736d8d14e3c10cce4bd45749..dd34f1b32b7976ca316f50235448788d20b49160 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 fdc704abc8d4f076215757c9c4122fa9c91e7a01..94f02ada4082622d72dac89e2d89463217be6f20 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 26e957b21fbf7709c35ac303843cffd669a52971..303cc3dc1749304461e11e6f8c89e6892dc5bb93 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 1aa4df1385cbc674a966fcf560e9bf247b8e1360..51af9d374d66c45101e07c7265476f9902db5267 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 160b88000b4b70815edeec254913bf834a347cdc..f6fa9afcbfd3462eb6913f3046acdb1ab06da26d 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 46212b52c23e312a483a3ada6a517a4d4f0e9f4e..cab8f64ca4a20f8882ba9f17b3373d6342759af0 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 676683641d00c9a3e3798d8ce225de00b451eebd..e1a8fee3ad491f62424c02769769235d15a0297e 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 a63ec938636de5107579dfc5db3af416d1393b3d..635969b5b58e529c875c10cdce5f112537b79728 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 d964c4d6b1390bd5e1329b8d47b227ca4de52168..77dad1e511b4652b25a6d3137d2059d22a86629d 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 9108789fafef7c7e1e72ec4cd8645a32e8891600..3b6ea2d99013626bcfd26f404dee9bb2cc2ae197 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 4cec14700adc652af3b4eaf1ec7671c35f9dcafe..8ef76e288da00cbf05a9be081fe355abe23ba6a5 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 895576ff837632fb642fcc8318fd8b2688e0fc56..a37e1e88c6b1f22f6cfba2360bed189ef6614f2c 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 cf2fcccca8126dce0586fc363e04c509e18b633c..24391b444b286deb848a6afd2b97b94d1e50119d 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 49303fab187bf66fa1671f480bb32acd9eb2d38f..03225d27770b656618cf8923f177c999f742895f 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 1495489225aceac653bb22601796b354762c2b70..39c9ead489e5cee48056d8918bbe26510d7c0ae1 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 744f903b4df359b8efe63671897a2f769e5b91d8..1b3050facda879f39ba683f382095b4acc1755e2 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 ae44dc24c4557b972488bd334b77cfc3e42c0bf6..d0d5d81455ae1e4139dff4fcd50402ed6710f09d 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 43763c26a752bbb4e43c6482acc8eba2fa9fdd88..dee6be2c23443dca65d1d52baac3c3426e81af0f 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 eeb25a4fa55f24e91071403b87da8f6d014878ec..d4811691b93cc170c8d4c3b39f29c84401e6ccac 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 f4afa301954a2fd039c42d4e20f50d93f16ae959..9bb27e5c22f159c97fed8410d59dd92c91084e0e 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 4b460e01acfa8920fbcf1abd525fa2784392eb5c..3ca74e1cde7d63d5c203c2ef65bf4ec7ce51e139 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 5da106f84e8407c3e3aed2f356b9b96132520be6..fe698f96617ca7ee9bbdde5107af1abc58fc17e2 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 c6f791bc481eb19d5fb4cb34989c2b485c82c038..7a50f0b62a709091dfd17619252efbdf4eb1ad7f 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 1daf8f2aa21f515e88243a6178d4b2709f5151eb..896d74cb5081a8c898fcd3327c7a30529a6d4370 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 4c61f07138320617d6dca23a450e82ce1fd622f2..b89f6ac6a0c01f0c4fa1c8ccfa954fc6303f1e39 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 92153d054d6c542b06ecdc87a4ec1e3e0b39786e..bda73cb7a0446b932a60710525b1a605331445cf 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 887d181b769b0cd2789f817f99efb64eaffc73b7..0c7b6e66c64484d2bfa402033e70a3f5c901a485 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 433376e819bbe752d9cd2840e6efd4ad431dfc82..953437a216f63b02b9e9518e9f21e424e47cf835 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 135173c8d13891a952ed12afe985e34e082a0f69..391dff0f25a2ba61943ddd63b26c11b4c27cc9e7 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 d3d851b014a3765cd50d0f01533ec6feb4ae3f00..bd87476ab48136f19286a94a21d0735b1a944ff5 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 deae466395de1a656d5cba27720fb8f345e6c332..479c4b29b856261200740be36c1bd72a57027b81 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 b23d1e4bad33b20653b213047d815f388dfd0d47..8fad56f185ba4875fbd8e0dd4b61deac20963ca2 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 57f10b58b47cd3855ad117bb1ce57791e4c97532..c153c96a6145be2433cc42e4659f2fa63be3dbc5 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 c42cec7c7ecc0a88f649b315c8c8616a0439c2f8..88a93c266c19930f3cc6b4644c1b8ec8e7cc25d0 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 c8073b509a2ba541eb6fc515a23a13b805e7c90e..90d5bdc12e0337f28b213b219d72056972683531 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 4a2d1b235fb5af3e51ac8b044e6a18aed5753cec..fd546c51b076ad93c03a0f32ad37ee83b4a7434b 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 1f3f9e0f02a82673a6280c0dc0edf39a738c0aae..4eaf97d7a1704ff8daa64fb8dc55acc4864ddccc 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 d9629fc13a15538115abb0fc46702087c0d401d7..6ae48ad804091f79040dc7ef2034d3a0a8b8d0ea 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 ab154a75acf0edd6d68a297df3bf9b7c0f25834b..9e84239f88d4c8478be133c0cf2f1d7977f9d92f 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 c6271ce250b32150ffa6516526d79f80516398dc..66a62d17a3f51ce80bd7220d2110b1225e341a94 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 eb108b3c619a3f5b3a71291cb1f58dca977a9fab..51121a4b82c77105984216c96d949da6cd42a4f2 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 290c880266bfed3780bba77e674634e91c83d2b2..9f205bd1acc0124ae5546aab56ea397b228a05e7 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 8c78aa0904925728404b49aedda73a212330cb3a..7be8067ac4e87cfe9e5009811f5e91b02058e57e 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 fbc34beafc7820eaf704d8ce8ddce045f84ab369..7b703f14e20bb7f1ad45c594c7abab67dc13cce8 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 9cde50cb322008a02a1d38c56f68a9a07f923fac..12ac75f7571f279e9effc339e53162cccfad77b0 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 64526e50d471c1f096b372a69fbaee1d2948da4b..bfccb31e94ad9914314e258cd89ce573d78fabfb 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 d49690d1553670e65bede80e78e2e07e648b5ecd..d41df9ba3725d0d2462a3db9a363e0501f4753a4 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 fdc767fdbe6a8bdc14dfef0b90201ce4b25e1b7a..89d4fa8b65e983a6793fc7f44344d21e2a863f75 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 4e7323884ae30ea9b5bc83ab77707bce48859f43..354836468c5d9854e12a1777b76b55227766ab53 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 832aefbe7af96d321e41b4261d966b44beffa3fe..539e785039cacfa610be9a8ff5786e6637abb460 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 f564a4a8a4aec88cf1cfa1ebe9b4648c16d2a523..5c1eea96230c3fc5252576da7f6a5fb378f5bdea 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 432b375a407540e499e00b7abf4abd4ca995a0d0..a8988db6d4235f65fa33793b4bd2d55d8e63dfab 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 7c6a2d4d23606de53e9edcbdab9f334a21b04499..6be99e0d850dc12b68b96d907d6d94f7f5fb1f53 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 4f65073f230b2b70db37f9bbbe456f7da2f59246..d68346a8e141a80270e9dd9f255b0a5adeef3de0 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 cc779f3f9e2dc92592de30b7eb3d9cf31e807e67..a65e2f78a402237500181e2368219d0d1c90da96 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 0cc7466736773e8e0a1fb3f52732714820c730f5..6ca2f5ab6c57e8849dda47ad66b7d635341e50bf 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 da04fdae62a15da32a25399a0926f503685b70d7..835ece9c00f106c74b7b5d6ed6246d124e442f21 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 afaf4bea21cfc32f86aa5f5f8124d4f85ad79b15..9278bcfad1bf4423cc44de353e60d0c7981256a1 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 7005f8f69c683749a0e7493c001d929e7c1fa091..0900052fc4844fda252d362811f7e5f39deba7fa 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 2fd4ca91a62d938c7a79e6076cc816982273434d..8dd5a43e548658c255db8cf03714ef49fe053057 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 6239a9adbf14e4cf0e1973039d58303af1737101..f24064893b30bce314d87033e0fa93170ea98542 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 c84f0a8b3f2cebf76f99a70c01e4377fde610d0e..ac678ace09a36aabc8826ff2d2a8c43170937e30 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 098bc9f40b983300a5bfbf28851cee016e929732..15bf8a207cb0f648abbb7d2540cf54e682e9734d 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 68289b0b063a7a06c06e8d54e603fd4047fc05e9..68261c7f8c5fa6c4ed3d4d3d2e63eba919a9ba4e 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 8f7bf33815fd18f6e0b3f11eb078b98282a57e8c..2bb32009d117a050d2d1dda121aec678f0ea31ec 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 814560ead4e184063a9fc7b33ac4bdb7e9795b08..64ed102033c8b32d4af161f2ea9b7eea36c195c4 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 5767e93dd1cdc034c520adac8b774f745c1f185a..c36a8da373cb5d81b0269d31a1295f07b2b83bbb 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 0b17ac8a3faaa840095a8665083143060c15b4c4..5e5f82b6a5d940809631a62a8493268d96eee683 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 2a9e675973757bc875b0135afb923777c48c0956..a3612369750fd73d530b7525a9ad1a57b32908e7 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 6b0883a1776e1c8645024379242b3eabfd2b1f33..97fd1dafc3e850f46c258d3b0a6407aec7289346 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 b09c39abd3a818cf2d710588a9d6267a1360e577..eeac4b04df278b62746609e465ae38e6496cde12 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 ff340d7ae2e52c1442e25bceaadffa8d67dcee33..abfe3094c047d0abe6742d023816a03a2044a67f 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 0829cb696d9d4a276bbb80038fe0c9186b8b2579..4fde74eb34a7a2614261c4e935e6b9daa7a8686d 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 958c1ff9c515c46767f2a3a1d03a1687671ebf61..0441c7eea36bfb56d6ac54f0e9f43d000c7f4f1e 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 5cdfa84faf85e1ff35a2ead998a06ba2cf0a1c3b..1291b12287a5dfd8728f6ee79678ba0432d1e867 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 bdbde8e22420d39042a91770a36cd2f6c6399c60..60ea1b924b67046b71b780fc1f70662e2d02549f 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 61362bd6d3cedbca307c7c4bb3eb201128329a16..1a6268d61977aa0bac0649d57fdda94be36a20ba 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 dd4843379f51de80f3d0219f13fec4005445abe3..91d64dd71a8a338a55ffc14e365fe42d651380f5 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 d4fd8a6cff7b9176fc2ba33ae6ed872c189326af..43c8ee1f46e042a37e74973db87f86ccc566e47a 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 864f2af171f70278106b58bb934ad4936da502be..3dc6ce03331905f9d21716ac6ae3a4dafdc85c65 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 f7414091d94e2ace58eb14a77b6138dbdc68489d..2fe9dcfe0a6fd8e21ae6e4ef39a106036f4a62b6 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 27ad73f43451d41d64c0f150b22b6b5f144bdc5d..c155adebf96e4d21d3fdeaab81100a6e9468e3d1 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 41acde60b60f487046b7fc241a785cfe21e09d93..3332b77eef2aecbe5748722d6ea40eae42677649 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 96f9b5397367fca2388b3186296611ae7287dec9..2f9775de3c5b93c779a1884724e67c3cc389cae0 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 568c52317757ca2924598b69c7329dcfad940356..27bde309e6f72a532423cfc4dcb8d3937cf72497 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 d246d74ec3a5b964cb3608e5b82f28c8e669ca16..23445ebfda5c1fea492de4ece16e7fd5bf32f78c 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 9c2a4b5d30cfc0c3d7ba07ee15eccd7668e179d6..d480a514c983792082e4715c7a9990812db372ba 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 f3985469c2211c7fea4b40469a47c1e27711a510..d70507133c1ded9d2831c20ce7725026d1bff376 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 f82bc60a67931cd70a6b9baf2d30e44de716b28d..6e5e3172796bca3ba1598192dec69d125ca91f93 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 04d51ca6322399589fc62345044146882de643dd..4c8c96a35282185c77845bb449279304acb3b907 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 fd47bd07ffd8070e53a48b37fa3e2c30b0c2d350..2f1eeeb6e7c748c035578e095d493e2b805bfa77 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 3f3f40ea890bbc045376a3d15400d336143fc2ec..1f79700a6307a7870717dafef10f25b575c73421 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 f299baf7cbe084fa57ac0581d67c9253ec0c1c71..e06d113dfe9668d707e32f360091c563d679170b 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 2fc6c9c38f9ccd8aa4ce1fe79b4c4d499dbb72bc..c6378c4e00745db3bbf8a570fc96f242ebbb4317 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 e2e7ab7b7f45b8698fbb82ee3983f9d7b234bbda..b49378b18e5d7409ac1fd0de78cc9e7d333fc777 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 a99caac59f444081a64bc6e96f2b6e8fa2f7e720..1ac0c70a5981829afe733ccb4a5066ae3e52625c 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 fd7b2167103d5e7ee4dd4361dc8306fff3b371c1..06038b325b023a815c277de89854536e495e3be6 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 c25fd40f3bd0fade7b98f505f73f1371ce8b1fd4..fcd999f50d14349ad007daf965183af5ebb98dca 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 359c5bab45acf4f0f3cd875ea8918548706b36e7..063e4419cd7e13cfb4de3da23fc51c13494a4b66 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 105e73d4a3b9c2160497c63588284600c0b89663..674f9e084cd21789a9b92b32c9d9f1c2c8de5726 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 f4ac064ff471ddd0aa652f0721951346930e872c..e48bddd95ce6bc6e5775c0f7c34319747b72684d 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 eccf2e5d905e89309dbfcb3221855f4a100451da..3af50db8b21b4f274e65a7cffa0acc6441fc7ade 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 462fadb56bdb190d2f91e36ae16ca4ea53a0bbcf..42a95ba40f2cb74406da23c406f19cca9de34024 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 c9b7b4d5a9230634cc3dc8628782d828e10108b8..460494212f6a7bc5529b36a357d28bc68a4eb358 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 5c27c6994896011ec1bd28ef0827c0d64e02016c..85e14150a07306809c753ae81b6f560f4dd3c64f 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 6b989f391baac0dafff16ffe178803d2ecdf7f9c..fda72c5fd8f93adab3903ad7da0f48d664f3ef27 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 69503aef981e6f9e059463d25cb958b6f35fd2e8..d67b845b0e896617262343ec90888a1452726f24 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 0eeadfeb620da2c3df99d3c24c69088e5eea83b0..832b880d1aaf82930de45ee706a949b72df59a1c 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 abc52b70bb004ed9c46757fc7262913c259745b9..0bb651624f0578c1ae53b8ffa43af7e8acd0dba3 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 50046d497398e331d68e5b7c62c216d7e37df70c..7d349874ffeb6a5546d66761cd86fe0d2cf0e536 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 9a49f8a06fb886c4cbf0850f304e51336a8ec543..377ef0fc4e3efd9e5a45f4e5ee4a7d1c2f42fc93 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 03af2df90d47567b8dd9436aba5a4ebc3f85977c..9902b37e18b4ec6e42686523d0dd16a10ba7fb5b 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 2afb253bf456838de1a1bbb56b6c8ef84db5b3a1..57303f904bc1200dce8b523d9ecd65162e523828 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 6cfc8783c0e5e9a8fb03065186a8742ad865eff4..70d6e865f55512087916f850d116284049905e99 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 e10b76089048e06dbfd83a41f05ac14fca01ceb7..75eb3e97fae3457333891b43fc893045c2a2440a 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 d62aa5271753e802f286aa431c61a36e2f6997aa..2f77ee55e1bfcb2f8cf4589b3b2635d001fc66f6 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 1054cc070747e2b31e28bd6a82b3bc0aea89f708..f31fae3a4c6894a5c72498d6b672548c0bff06d2 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 c8e1a04ba384dfbea3c8e1d191cc1c07cbf455e8..9df2007b5e56b50e7a5f19368533239c80c78253 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 b9047d8110d5a827e4f2629cfb3ac3a7b8fc1794..194c86e0f340fb873965ce05f543f09b4c314482 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 1c4d32d1a542e7e78f9e318443e4d26bf6841970..d513fac50718542061f786a75191fe1f25e711bd 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 ff5a96f3408585cde10893135327575125e7a164..d7222ba466225cd423c9974fd65c76dac965ad03 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 8242fb287cbbe2c5039388de249006629636f12a..d1ddf763b188b9bca02f5fb04e8a8626cac0a9aa 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 80ef3e15bd225aca10c6afa9fb8ed3569499906c..9daef4c8feef2c0c4d2be3cd039e55c2110492aa 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 4cd53fc338b5da69a93c01fa4510f868294a5fa2..1671c1f36691d450d6a2c38905659d511ec5fd32 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 1793950f058270d805183635f9ce8cec1e993052..307e402db8c90d8fd00347aa9f51813faeb85598 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 2bb329606794b0f19a94bf214ad7c3d143dc5974..6b27af0db4992888ec1d2648ef6b51f5c89aabc3 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 61a334d1b5e6888ade3de9b25cef2b5d59d18b76..60ba69db48c603432cc907855efb3f79a2e10989 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 cff64e43bdd80552e160d4d4935f2f55b37272e1..61fa32cdd3e33f4745f713e37a0fb281a3d21ecd 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 1604ad32e9202c7282661ccf62c99ee54ed6addb..f991537818fe939c1a66c36c19bc971ae1979de5 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 e338272931d14be95613a4c0ea97b610dd800439..01a50a4b21135fd2c347c6d80aadc3ca874bb5b6 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 58f89f6a040fe39ef02d18d1fa65123d7cc7619a..2824b5ed4cedf20441f76cd2509aefb1959e11d9 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 f1a2da15dd0a6f00718eb68fb1eb82214c2c484d..7852a4308194258eaa9e61040d09665b81bc1218 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 ea4f17f5cce77e6943340d5ccd69dc4042f1faef..c6e74ae0ff0d6950d2c0e7849abdbb0bff826dc4 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 6436a98c5953fcd92ad37e1436e784b53b39c709..22f5887578b2bdf1e9a30b86c0564b02391c04e6 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 ae195f8adff588a85994d770d8c4bd8a3d91fc00..d3164537b694c2a3c5218372750660d6467206b3 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 6e73ffe6f92870f0845e9d31a9dc9f59ebda4b7e..41f2f54807417c145b382dc4b403c262013469db 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 095f6c71b4fa1dc61476be81f49c1b5c11a5c19b..7515d079c600c7bd6d5ba9dff3317d038f52e9c5 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 5f56ee83e3b10d3eed5b3eda9e024ad5781d5cd1..535dee35e04ec11e7913f467f4b3c5b2b5506b3d 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 6af9a7eee114969ed874161ffe059bfba57f40ac..09125406105258af591e860c540c343abd06d7fa 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 e4977cdf767899a3a664919aee2f1687893b884a..c0e2f4394aef843fb41d8697f08ac03b4d840c4e 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 85d46f206b3c260d163e0c28e27d62f8f42ac722..b454db283aefce409ed1db14ebe638c6e6d420b0 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 4d9bbccc6f89cd477f7d56fb4ada54a6a23f17e6..a6ae2cdc19862be9f80a1c4d215c420d718bb44a 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 7a38d7f282a11aedc3cd47bfc0ad35cb12f19df3..6891df471538cd391adb200dc04cbdab0ae9a67f 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 eecc348b1c32f136a5a90405881315b80355bc90..53ae9faeb4c31d930dc5eff2dac0ac5455d5d6a3 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 38068fc341410f1237eec25b61a9d9542d7dc1e9..6d90a097ce4e74ad2b4257828d02358e1b60e30c 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 1b2702f7445520234187ec66230fe1dacd0d2a26..675f31de59ddc7204f79bf36afa5c5dce736cc33 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 21c1b4322ea78941d0ee58801dbe62f3442f1acc..c66aab78dcac801e234c80c7ac4b438f0da538d9 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 56b7791911bfc3b32d87922ca45632202e7963a4..077c68498f048a57ac798f665a2ee043f43cf06c 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 060712c666bf432f0570a98532a655984144e9b1..eaf85db53a5efe0de0ae6ae4cf13282499b6adc0 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 8a4fbfacad7ef09e0463bf1a6a0fa76b75393210..065bb0a40b1d1e3343bfaeadc3eb85b8a129f551 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 34e94ee806d65c1310a0b197b85c5709dbf46611..23f93f1c815d0914d3936cfebf2d7c542fc095bd 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 f80854180e2158b6e03dc1fcd79552be8c237415..ed87bc00f2aa81dd5a8c94aad4de238ef3224c6b 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 c0794f5988b348a1877e3dda52777c0a05f5cb85..2c9cec8b53d9e22a2e7683b92ac0feb23593fc2d 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 63019c3de034d4771974b8d5aa01d73bae2dc74a..cdefb8e2daf1437e98309afdd01ca218a7de554e 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 f64ce5074a55a497cc01f3803cb0879635d762a0..c85840cabebe6c5d53bde4f3875e5e65644f937d 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 c4c83ab60cbc46f184d140e940a8da44c84513e7..e85858eec8ffb0253c0c588d49830cc30b8ce5fd 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 1c69c404df1149d96ef1abe24767a96077ab199b..e3357e91decb252957d7ae535a5745fb89c91fc7 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 ad290f79983b940fa4a49dfb479eb71eed681f87..a5507f75b524c47f7b2ee8238a48b730e8b5bbce 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 2f1cac89ddf5ce036126b059b3103b08e21db891..889d7ce282ebb01e059597e1b2d91c6396f2c10f 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 37a2c5db761d2ffd5b77e6c3ef5e498e3f5bf41d..9d00a24277aa7afd694ae0b7f71a45a31f0e3508 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 32f506f00c8977639a33efb285a10318e4e66397..8a3b0c3a1e92bdcfc50c664a7caea0f7818cd8d6 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 a99e385c68bd6ca716d4ab713fbc05583e4f585b..732b516c7bf849d3b78109065af75b40e05ac95b 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 de8e4e347249179a7cd3085f6a3c6f49e8ffd369..7e112829d2503aebab87cb6a29fd6aa3ee845f17 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 b20651cea09f84095fdbd4c1a304a3d8cd5ce3b5..9bf7fa99b103e1f5f84ff2ed5b9d65c80f88865b 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 3dd2e26972948dbf5db2086f1dd6eedb3c6df7c3..cfeccd7e9fff29bd5a116ad0d8b4e5ef28c07a34 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 c7709e49f0e497065d528b2fbf753e30f919e3ba..6b43a5455c7af88c0df2f8af5073eac2e5a8d2d7 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 e87196cc1a7fba33d37661ad0f73ca1dd1418583..df21e3227b57e711fbb0e33c4624fc1401ce9496 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 4937a088d7d8460da6ed8fcf2c79494db9b7941b..0d92374b0a113960fcfdbc4ba0f7609d3b92b0a9 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 32f268f173d1e854bd9de7c44b98364c95f7a511..57044ab376d3cf72954813bfe303ab7e0c8d644f 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 3756fc9d5826b72bc2f338315e4a328b6c2e5a0e..f1d60a708815a870996248e4c3972dd3e1d51d4f 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 7e29e3fecdb246568a78a205f978325c5f203cdf..c00d0022d311bdf01adc5f30409a60abdd60c6eb 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 eab078244a4c3e8c4c6bfea829e41edab62f76c4..73aff6591de21df2455a1bfb43a3c7f59c6ef721 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 cdab916fbf92775320400d1879e112dfdc8e4034..5ea5245b8b15425dfaa07c940aeea548d0da3868 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 df8565bad595c72ba7b889a7d50afe2e0e75d9c6..ebfcfead23b477b2f3f05bccb7cc558f99ec4c5f 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 52ef1419b6715d281c8a72b2151b5e614af78c85..3e3c66dfec2e5e52e65899ccf731060b72a41ffd 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 9b6a93ff41ffb4be87038053b3d9c7d757b2b21b..23e40aa2176e861ce98db35e7ec4ca6ae1d5c3e9 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 89b9314d64c9dbe5fe152b06c252b1567600857c..af9abcd9c16652dca56237e41d95954aa4892e90 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 579b3ff5c644fd9df948ed2773bd7a99694e27ca..feb1f8e52c0084054003b131e17b73a737a1af13 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 8466aa784ec1aab828af2399fa80b3792e0d6290..8b891a05d9e76bc0e1b73857b6dc405df69204b2 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 717d8d1082ce18ae9899870e43238c1443fdb36f..9b293b1f0b716a7dff86d45f178e5eeebef9ccf9 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 db687ef8a99ec5590e86d2248cbd87a823a59098..40dc8eac0e3a3982b29958a7d918b5bfb62ed6ef 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 0760d0bd8a10b297837acd3d1042a914fe281104..9b81cfbbc5c532d7e2a164805ed40efbdccb7ff9 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),