RFC: kill off ioremap_nocache
Subsystems (172)
Hi all,
with the ioremap changes that did land in 5.5-rc1 ioremap_nocache is now equal to ioremap for all architectures. For most architectures including the common one this has been the case for about 20 years, but we had a few holdouts.
That means ioremap_nocache is entirely superflous now and can be killed off. This series has one big scripted patch to do just that after a little prep patch to fix up the not entirely obvious mips definition.
Let me know what you think and if this is something acceptable for just after -rc1.
PATCH 1/2 MIPS: define ioremap_nocache to ioremap
They are both defined the same way, but this makes it easier to validate the scripted ioremap_nocache removal following soon.
--- arch/mips/include/asm/io.h | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)
arch/mips/include/asm/io.h +2 -23
@@ -227,29 +227,8 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset,*/ #define ioremap (offset, size) \ __ioremap_mode((offset), (size), _CACHE_UNCACHED) - -/* -* ioremap_nocache - map bus memory into CPU space -* @offset: bus address of the memory -* @size: size of the resource to map -* -* ioremap_nocache performs a platform specific sequence of operations to -* make bus memory CPU accessible via the readb/readw/readl/writeb/ -* writew/writel functions and the other mmio helpers. The returned -* address is not guaranteed to be usable directly as a virtual -* address. -* -* This version of ioremap ensures that the memory is marked uncachable -* on the CPU as well as honouring existing caching rules from things like -* the PCI bus. Note that there are other caches and buffers on many -* busses. In particular driver authors should read up on PCI writes -* -* It's useful if some control registers are in such an area and -* write combining or read caching is not desirable: -*/ -#define ioremap_nocache (offset, size) \ - __ioremap_mode((offset), (size), _CACHE_UNCACHED) -#define ioremap_uc ioremap_nocache +#define ioremap_nocache ioremap +#define ioremap_uc ioremap/* * ioremap_cache - map bus memory into CPU space
Signature · 1 line
2.20.1
Re: [PATCH 1/2] MIPS: define ioremap_nocache to ioremap
Hi Christoph,
Quoted 4 lines · Christoph Hellwig
They are both defined the same way, but this makes it easier to validate the scripted
ioremap_nocacheremoval following soon.Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
Paul
Quoted 43 lines
--- arch/mips/include/asm/io.h | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)arch/mips/include/asm/io.h +2
-23@@ -227,29 +227,8 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset,*/ #define ioremap (offset, size) \ __ioremap_mode((offset), (size), _CACHE_UNCACHED) - -/* -* ioremap_nocache - map bus memory into CPU space -* @offset: bus address of the memory -* @size: size of the resource to map -* -* ioremap_nocache performs a platform specific sequence of operations to -* make bus memory CPU accessible via the readb/readw/readl/writeb/ -* writew/writel functions and the other mmio helpers. The returned -* address is not guaranteed to be usable directly as a virtual -* address. -* -* This version of ioremap ensures that the memory is marked uncachable -* on the CPU as well as honouring existing caching rules from things like -* the PCI bus. Note that there are other caches and buffers on many -* busses. In particular driver authors should read up on PCI writes -* -* It's useful if some control registers are in such an area and -* write combining or read caching is not desirable: -*/ -#define ioremap_nocache (offset, size) \ - __ioremap_mode((offset), (size), _CACHE_UNCACHED) -#define ioremap_uc ioremap_nocache +#define ioremap_nocache ioremap +#define ioremap_uc ioremap/* * ioremap_cache - map bus memory into CPU space Signature · 1 line
2.20.1
PATCH 2/2 remove ioremap_nocache and devm_ioremap_nocache
In reply to Christoph Hellwigioremap has provided non-cached semantics by default since the Linux 2.6 days, so remove the additional ioremap_nocache interface.
--- .../driver-api/driver-model/devres.rst | 1 - .../kernel-api/writing-an-alsa-driver.rst | 2 +- Documentation/x86/pat.rst | 2 -- arch/alpha/include/asm/io.h | 10 ++-------- arch/arm/include/asm/io.h | 8 -------- arch/arm/mach-bcm/platsmp.c | 4 ++-- arch/arm/mach-davinci/devices.c | 2 +- arch/arm/mach-pxa/magician.c | 2 +- arch/arm/mach-shmobile/platsmp-apmu.c | 2 +- arch/arm/mach-shmobile/pm-rcar-gen2.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 8 ++++---- arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- arch/hexagon/include/asm/io.h | 2 -- arch/ia64/include/asm/vga.h | 2 +- arch/ia64/kernel/cyclone.c | 8 ++++---- arch/m68k/include/asm/kmap.h | 1 - arch/mips/ar7/clock.c | 8 ++++---- arch/mips/ar7/gpio.c | 2 +- arch/mips/ar7/platform.c | 2 +- arch/mips/ath25/ar2315.c | 4 ++-- arch/mips/ath25/ar5312.c | 6 +++--- arch/mips/ath25/board.c | 2 +- arch/mips/ath79/common.c | 2 +- arch/mips/ath79/setup.c | 4 ++-- arch/mips/cavium-octeon/setup.c | 2 +- arch/mips/generic/board-ocelot.c | 2 +- arch/mips/include/asm/io.h | 1 - arch/mips/kernel/mips-cm.c | 4 ++-- arch/mips/kernel/mips-cpc.c | 2 +- arch/mips/lantiq/falcon/sysctrl.c | 6 +++--- arch/mips/lantiq/irq.c | 4 ++-- arch/mips/lantiq/xway/sysctrl.c | 6 +++--- arch/mips/loongson2ef/common/reset.c | 4 ++-- arch/mips/loongson32/common/prom.c | 8 ++++---- arch/mips/loongson32/common/reset.c | 2 +- arch/mips/loongson32/common/time.c | 2 +- arch/mips/loongson64/reset.c | 2 +- arch/mips/mti-malta/malta-dtshim.c | 2 +- arch/mips/pci/pci-alchemy.c | 2 +- arch/mips/pci/pci-ar2315.c | 2 +- arch/mips/pci/pci-bcm63xx.c | 2 +- arch/mips/pci/pci-rt2880.c | 2 +- arch/mips/pic32/pic32mzda/early_console.c | 2 +- arch/mips/pic32/pic32mzda/early_pin.c | 4 ++-- arch/mips/pmcs-msp71xx/msp_serial.c | 4 ++-- arch/mips/ralink/irq.c | 2 +- arch/mips/ralink/of.c | 2 +- arch/mips/rb532/devices.c | 2 +- arch/mips/rb532/gpio.c | 2 +- arch/mips/rb532/prom.c | 2 +- arch/mips/rb532/setup.c | 2 +- arch/mips/sni/rm200.c | 4 ++-- arch/parisc/include/asm/io.h | 5 ++--- arch/parisc/kernel/perf.c | 2 +- arch/powerpc/include/asm/io.h | 3 --- arch/sh/boards/board-sh7785lcr.c | 2 +- arch/sh/boards/mach-cayman/irq.c | 2 +- arch/sh/boards/mach-cayman/setup.c | 2 +- arch/sh/boards/mach-sdk7786/fpga.c | 2 +- arch/sh/drivers/heartbeat.c | 2 +- arch/sh/drivers/pci/pci-sh5.c | 4 ++-- arch/sh/include/asm/io.h | 1 - arch/sh/kernel/cpu/irq/intc-sh5.c | 2 +- arch/sh/kernel/cpu/sh2/smp-j2.c | 4 ++-- arch/sh/kernel/cpu/sh5/clock-sh5.c | 2 +- arch/sh/kernel/dma-coherent.c | 2 +- arch/sparc/include/asm/io_64.h | 1 - arch/unicore32/include/asm/io.h | 1 - arch/x86/kernel/apb_timer.c | 2 +- arch/x86/kernel/hpet.c | 2 +- arch/x86/kernel/quirks.c | 2 +- arch/x86/kernel/tboot.c | 2 +- arch/x86/mm/testmmiotrace.c | 4 ++-- arch/x86/pci/mmconfig_64.c | 2 +- drivers/acpi/acpi_lpit.c | 2 +- drivers/ata/pata_arasan_cf.c | 2 +- drivers/ata/pata_octeon_cf.c | 6 +++--- drivers/ata/pata_rb532_cf.c | 2 +- drivers/atm/eni.c | 8 +------- drivers/bcma/driver_chipcommon_b.c | 2 +- drivers/bcma/driver_pci_host.c | 6 +++--- drivers/bcma/host_soc.c | 2 +- drivers/bcma/scan.c | 6 +++--- drivers/block/umem.c | 2 +- drivers/bus/fsl-mc/mc-io.c | 4 ++-- drivers/char/agp/generic.c | 2 +- drivers/char/agp/intel-gtt.c | 2 +- drivers/char/applicom.c | 4 ++-- drivers/char/hw_random/intel-rng.c | 2 +- drivers/char/hw_random/octeon-rng.c | 4 ++-- drivers/clk/renesas/clk-rz.c | 4 ++-- drivers/clocksource/sh_cmt.c | 2 +- drivers/clocksource/sh_mtu2.c | 2 +- drivers/clocksource/sh_tmu.c | 2 +- drivers/cpufreq/pcc-cpufreq.c | 2 +- drivers/crypto/hifn_795x.c | 2 +- drivers/dma/altera-msgdma.c | 4 ++-- drivers/edac/i3000_edac.c | 2 +- drivers/edac/i3200_edac.c | 2 +- drivers/edac/i82975x_edac.c | 2 +- drivers/edac/ie31200_edac.c | 2 +- drivers/edac/x38_edac.c | 2 +- drivers/firewire/nosy.c | 2 +- drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- drivers/gpu/drm/gma500/gtt.c | 2 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 2 +- drivers/gpu/drm/sti/sti_hda.c | 4 ++-- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_tvout.c | 2 +- drivers/gpu/drm/sti/sti_vtg.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 4 ++-- drivers/hwmon/i5k_amb.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 2 +- drivers/i2c/busses/i2c-pmcmsp.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 ++-- drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 +- drivers/infiniband/hw/hfi1/pcie.c | 4 ++-- drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- drivers/infiniband/hw/qib/qib_init.c | 4 ++-- drivers/infiniband/hw/qib/qib_pcie.c | 2 +- drivers/input/keyboard/pxa930_rotary.c | 2 +- drivers/input/keyboard/sh_keysc.c | 2 +- drivers/input/mouse/pxa930_trkball.c | 2 +- drivers/input/serio/gscps2.c | 2 +- drivers/iommu/amd_iommu_init.c | 2 +- drivers/ipack/carriers/tpci200.c | 4 ++-- drivers/ipack/devices/ipoctal.c | 6 +++--- drivers/irqchip/irq-mips-gic.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- .../common/videobuf2/videobuf2-vmalloc.c | 2 +- drivers/media/pci/cx18/cx18-driver.c | 2 +- drivers/media/pci/ivtv/ivtv-driver.c | 6 +++--- drivers/media/platform/davinci/dm355_ccdc.c | 2 +- drivers/media/platform/davinci/dm644x_ccdc.c | 2 +- drivers/media/platform/davinci/isif.c | 2 +- drivers/media/platform/tegra-cec/tegra_cec.c | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 2 +- drivers/misc/mic/scif/scif_nodeqp.c | 2 +- drivers/misc/pti.c | 2 +- drivers/mmc/host/sdhci-acpi.c | 2 +- drivers/mmc/host/via-sdmmc.c | 2 +- drivers/mtd/devices/bcm47xxsflash.c | 2 +- drivers/mtd/maps/amd76xrom.c | 2 +- drivers/mtd/maps/ck804xrom.c | 2 +- drivers/mtd/maps/esb2rom.c | 2 +- drivers/mtd/maps/ichxrom.c | 2 +- drivers/mtd/maps/intel_vr_nor.c | 4 ++-- drivers/mtd/maps/l440gx.c | 2 +- drivers/mtd/maps/netsc520.c | 4 ++-- drivers/mtd/maps/nettel.c | 8 ++++---- drivers/mtd/maps/pci.c | 4 ++-- drivers/mtd/maps/sc520cdp.c | 8 ++++---- drivers/mtd/maps/scb2_flash.c | 2 +- drivers/mtd/maps/ts5500_flash.c | 4 ++-- drivers/mtd/nand/raw/au1550nd.c | 2 +- drivers/mtd/nand/raw/denali_pci.c | 6 +++--- drivers/mtd/nand/raw/fsl_upm.c | 2 +- drivers/net/can/at91_can.c | 2 +- drivers/net/can/cc770/cc770_isa.c | 2 +- drivers/net/can/sja1000/sja1000_isa.c | 2 +- drivers/net/can/sja1000/sja1000_platform.c | 2 +- drivers/net/can/softing/softing_main.c | 2 +- drivers/net/ethernet/alacritech/slicoss.c | 2 +- drivers/net/ethernet/altera/altera_tse_main.c | 4 ++-- drivers/net/ethernet/amd/au1000_eth.c | 6 +++--- .../ethernet/aquantia/atlantic/aq_pci_func.c | 2 +- drivers/net/ethernet/atheros/ag71xx.c | 3 +-- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- drivers/net/ethernet/brocade/bna/bnad.c | 2 +- .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- drivers/net/ethernet/ethoc.c | 4 ++-- drivers/net/ethernet/i825xx/sni_82596.c | 6 +++--- drivers/net/ethernet/korina.c | 6 +++--- drivers/net/ethernet/lantiq_etop.c | 2 +- drivers/net/ethernet/marvell/skge.c | 2 +- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/natsemi/ns83820.c | 2 +- .../ethernet/netronome/nfp/nfp_netvf_main.c | 8 ++++---- .../netronome/nfp/nfpcore/nfp6000_pcie.c | 6 +++--- drivers/net/ethernet/sfc/ef10.c | 2 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/falcon/efx.c | 2 +- drivers/net/ethernet/smsc/smsc911x.c | 2 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++-- drivers/net/fddi/defxx.c | 2 +- drivers/net/fddi/defza.c | 2 +- drivers/net/fjes/fjes_hw.c | 2 +- drivers/net/wan/wanxl.c | 4 ++-- drivers/net/wireless/ath/ath10k/ahb.c | 4 ++-- drivers/net/wireless/ath/ath5k/ahb.c | 2 +- drivers/net/wireless/ath/ath9k/ahb.c | 2 +- .../broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- drivers/opp/ti-opp-supply.c | 2 +- drivers/parisc/ccio-dma.c | 2 +- drivers/parisc/dino.c | 2 +- drivers/parisc/eisa.c | 4 ++-- drivers/parisc/iosapic.c | 2 +- drivers/parisc/lba_pci.c | 8 ++++---- drivers/parisc/sba_iommu.c | 4 ++-- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- .../pci/controller/dwc/pcie-designware-ep.c | 2 +- drivers/pci/msi.c | 2 +- drivers/pci/pci.c | 2 +- drivers/pci/quirks.c | 4 ++-- drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 +- drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 2 +- drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 +- drivers/pinctrl/pinctrl-amd.c | 2 +- drivers/platform/x86/intel_scu_ipc.c | 2 +- drivers/platform/x86/intel_telemetry_pltdrv.c | 4 ++-- drivers/platform/x86/pmc_atom.c | 2 +- drivers/platform/x86/samsung-laptop.c | 4 ++-- drivers/regulator/ti-abb-regulator.c | 4 ++-- drivers/rtc/rtc-sh.c | 2 +- drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 2 +- drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- drivers/scsi/be2iscsi/be_main.c | 6 +++--- drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 4 ++-- drivers/scsi/csiostor/csio_init.c | 2 +- drivers/scsi/hpsa.c | 2 +- drivers/scsi/lasi700.c | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 2 +- drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- drivers/scsi/myrb.c | 2 +- drivers/scsi/myrs.c | 2 +- drivers/scsi/pcmcia/nsp_cs.c | 2 +- drivers/scsi/qla2xxx/qla_mr.c | 4 ++-- drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/sni_53c710.c | 2 +- drivers/scsi/sun3x_esp.c | 4 ++-- drivers/scsi/zalon.c | 2 +- drivers/scsi/zorro_esp.c | 6 +++--- drivers/sh/clk/core.c | 2 +- drivers/sh/intc/core.c | 2 +- drivers/sh/intc/userimask.c | 2 +- drivers/soc/tegra/flowctrl.c | 2 +- drivers/soc/tegra/fuse/fuse-tegra.c | 2 +- drivers/soc/tegra/fuse/tegra-apbmisc.c | 4 ++-- drivers/soc/tegra/pmc.c | 4 ++-- drivers/soc/xilinx/xlnx_vcu.c | 4 ++-- drivers/spi/spi-dw-mid.c | 2 +- drivers/spi/spi-jcore.c | 2 +- drivers/spi/spi-npcm-fiu.c | 2 +- drivers/ssb/driver_extif.c | 2 +- drivers/ssb/driver_pcicore.c | 6 +++--- drivers/staging/gasket/gasket_core.c | 2 +- drivers/staging/kpc2000/kpc2000/core.c | 4 ++-- drivers/staging/kpc2000/kpc2000_i2c.c | 2 +- drivers/staging/kpc2000/kpc2000_spi.c | 2 +- .../staging/kpc2000/kpc_dma/kpc_dma_driver.c | 2 +- .../staging/media/allegro-dvt/allegro-core.c | 4 ++-- drivers/staging/qlge/qlge_main.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- drivers/staging/rts5208/rtsx.c | 2 +- drivers/staging/sm750fb/sm750_hw.c | 2 +- drivers/staging/uwb/whc-rc.c | 6 +++--- drivers/tc/tc.c | 2 +- drivers/tty/cyclades.c | 10 +++++----- drivers/tty/mips_ejtag_fdc.c | 2 +- drivers/tty/moxa.c | 4 ++-- drivers/tty/serial/8250/8250_gsc.c | 2 +- drivers/tty/serial/8250/8250_omap.c | 2 +- drivers/tty/serial/8250/8250_pci.c | 6 +++--- drivers/tty/serial/8250/8250_port.c | 2 +- drivers/tty/serial/dz.c | 2 +- drivers/tty/serial/lantiq.c | 2 +- drivers/tty/serial/meson_uart.c | 2 +- drivers/tty/serial/mux.c | 2 +- drivers/tty/serial/owl-uart.c | 2 +- drivers/tty/serial/pic32_uart.c | 2 +- drivers/tty/serial/rda-uart.c | 2 +- drivers/tty/serial/sb1250-duart.c | 4 ++-- drivers/tty/serial/sh-sci.c | 2 +- drivers/tty/serial/zs.c | 2 +- drivers/tty/synclink.c | 4 ++-- drivers/tty/synclink_gt.c | 2 +- drivers/tty/synclinkmp.c | 8 ++++---- drivers/usb/core/hcd-pci.c | 2 +- drivers/usb/early/xhci-dbc.c | 2 +- drivers/usb/gadget/udc/amd5536udc_pci.c | 2 +- drivers/usb/gadget/udc/goku_udc.c | 2 +- drivers/usb/gadget/udc/net2272.c | 6 +++--- drivers/usb/gadget/udc/net2280.c | 2 +- drivers/usb/host/ehci-pmcmsp.c | 6 +++--- drivers/usb/host/pci-quirks.c | 2 +- drivers/usb/isp1760/isp1760-if.c | 4 ++-- .../usb/roles/intel-xhci-usb-role-switch.c | 2 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- .../platform/reset/vfio_platform_amdxgbe.c | 4 ++-- .../platform/reset/vfio_platform_bcmflexrm.c | 2 +- .../reset/vfio_platform_calxedaxgmac.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 4 ++-- drivers/video/fbdev/carminefb.c | 4 ++-- drivers/video/fbdev/i810/i810_main.c | 2 +- drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- drivers/video/fbdev/kyro/fbdev.c | 2 +- drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- drivers/video/fbdev/mbx/mbxfb.c | 4 ++-- drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 +- drivers/video/fbdev/pm2fb.c | 2 +- drivers/video/fbdev/pm3fb.c | 4 ++-- drivers/video/fbdev/pmag-aa-fb.c | 4 ++-- drivers/video/fbdev/pmag-ba-fb.c | 4 ++-- drivers/video/fbdev/pmagb-b-fb.c | 4 ++-- drivers/video/fbdev/pvr2fb.c | 4 ++-- drivers/video/fbdev/pxa168fb.c | 2 +- drivers/video/fbdev/s1d13xxxfb.c | 4 ++-- drivers/video/fbdev/sh7760fb.c | 2 +- drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- drivers/video/fbdev/sstfb.c | 4 ++-- drivers/video/fbdev/stifb.c | 4 ++-- drivers/video/fbdev/tdfxfb.c | 2 +- drivers/video/fbdev/tgafb.c | 2 +- drivers/video/fbdev/tridentfb.c | 4 ++-- drivers/video/fbdev/valkyriefb.c | 2 +- drivers/video/fbdev/vermilion/cr_pll.c | 2 +- drivers/video/fbdev/vermilion/vermilion.c | 4 ++-- drivers/video/fbdev/via/via-core.c | 2 +- drivers/video/fbdev/w100fb.c | 6 +++--- drivers/vme/boards/vme_vmivme7805.c | 2 +- drivers/vme/bridges/vme_ca91cx42.c | 4 ++-- drivers/vme/bridges/vme_tsi148.c | 4 ++-- drivers/w1/masters/matrox_w1.c | 2 +- drivers/watchdog/bcm63xx_wdt.c | 2 +- drivers/watchdog/intel_scu_watchdog.c | 2 +- drivers/watchdog/rc32434_wdt.c | 4 ++-- include/asm-generic/io.h | 4 ---- include/asm-generic/iomap.h | 4 ++-- include/linux/io.h | 6 ++---- lib/devres.c | 20 ------------------- scripts/coccinelle/free/devm_free.cocci | 4 ---- scripts/coccinelle/free/iounmap.cocci | 2 +- sound/drivers/ml403-ac97cr.c | 2 +- sound/isa/msnd/msnd_pinnacle.c | 2 +- sound/parisc/harmony.c | 2 +- sound/pci/aw2/aw2-alsa.c | 2 +- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/echoaudio/echoaudio.c | 2 +- sound/pci/nm256/nm256.c | 6 +++--- sound/pci/rme32.c | 2 +- sound/pci/rme96.c | 2 +- sound/pci/rme9652/hdsp.c | 2 +- sound/pci/rme9652/hdspm.c | 2 +- sound/pci/rme9652/rme9652.c | 2 +- sound/pci/sis7019.c | 2 +- sound/pci/ymfpci/ymfpci_main.c | 2 +- sound/soc/au1x/ac97c.c | 2 +- sound/soc/au1x/i2sc.c | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 10 +++++----- sound/soc/sh/fsi.c | 2 +- sound/x86/intel_hdmi_audio.c | 2 +- tools/testing/nvdimm/Kbuild | 4 ++-- tools/testing/nvdimm/test/iomap.c | 12 +++++------ tools/testing/nvdimm/test/nfit_test.h | 2 +- 368 files changed, 513 insertions(+), 578 deletions(-)
Documentation/driver-api/driver-model/devres.rst +0 -1
@@ -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
Documentation/sound/kernel-api/writing-an-alsa-driver.rst +1 -1
@@ -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:
Documentation/x86/pat.rst +0 -2
@@ -44,8 +44,6 @@ address range to avoid any aliasing. +------------------------+----------+--------------+------------------+ | ioremap_uc | -- | UC | UC | +------------------------+----------+--------------+------------------+ -| ioremap_nocache | -- | UC- | UC- | -+------------------------+----------+--------------+------------------+ | ioremap_wc | -- | -- | WC | +------------------------+----------+--------------+------------------+ | ioremap_wt | -- | -- | WT |
arch/alpha/include/asm/io.h +2 -8
@@ -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 ioremapstatic inline void iounmap (volatile void __iomem *addr) {
arch/arm/include/asm/io.h +0 -8
@@ -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
arch/arm/mach-bcm/platsmp.c +2 -2
@@ -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);
arch/arm/mach-davinci/devices.c +1 -1
@@ -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
arch/arm/mach-pxa/magician.c +1 -1
@@ -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 );
arch/arm/mach-shmobile/platsmp-apmu.c +1 -1
@@ -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);
arch/arm/mach-shmobile/pm-rcar-gen2.c +1 -1
@@ -103,7 +103,7 @@ void __init rcar_gen2_pm_init(void)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 );
arch/arm/mach-shmobile/setup-r8a7740.c +4 -4
@@ -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 ();
arch/arm/mach-shmobile/setup-r8a7778.c +1 -1
@@ -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);
arch/hexagon/include/asm/io.h +0 -2
@@ -172,8 +172,6 @@ static inline void writel(u32 data, volatile void __iomem *addr)#define writel_relaxed __raw_writelvoid __iomem *ioremap (unsigned long phys_addr,unsigned long size); -#define ioremap_nocache ioremap -#define __raw_writel writel
arch/ia64/include/asm/vga.h +1 -1
@@ -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))
arch/ia64/kernel/cyclone.c +4 -4
@@ -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" );
arch/m68k/include/asm/kmap.h +0 -1
@@ -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,
arch/mips/ar7/clock.c +4 -4
@@ -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;
arch/mips/ar7/gpio.c +1 -1
@@ -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);
arch/mips/ar7/platform.c +1 -1
@@ -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 ) {
arch/mips/ath25/ar2315.c +2 -2
@@ -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 ;
arch/mips/ath25/ar5312.c +3 -3
@@ -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 ;
arch/mips/ath25/board.c +1 -1
@@ -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 ;
arch/mips/ath79/common.c +1 -1
@@ -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 ;
arch/mips/ath79/setup.c +2 -2
@@ -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 ();
arch/mips/cavium-octeon/setup.c +1 -1
@@ -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++) {
arch/mips/generic/board-ocelot.c +1 -1
@@ -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 ); }
arch/mips/include/asm/io.h +0 -1
@@ -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/*
arch/mips/kernel/mips-cm.c +2 -2
@@ -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 ;
arch/mips/kernel/mips-cpc.c +1 -1
@@ -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 ;
arch/mips/lantiq/falcon/sysctrl.c +3 -3
@@ -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" );
arch/mips/lantiq/irq.c +2 -2
@@ -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" );
arch/mips/lantiq/xway/sysctrl.c +3 -3
@@ -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" );
arch/mips/loongson2ef/common/reset.c +2 -2
@@ -17,11 +17,11 @@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"
arch/mips/loongson32/common/prom.c +4 -4
@@ -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 ); }
arch/mips/loongson32/common/reset.c +1 -1
@@ -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" );
arch/mips/loongson32/common/time.c +1 -1
@@ -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" );
arch/mips/loongson64/reset.c +1 -1
@@ -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)
arch/mips/mti-malta/malta-dtshim.c +1 -1
@@ -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 ) {
arch/mips/pci/pci-alchemy.c +1 -1
@@ -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 ;
arch/mips/pci/pci-ar2315.c +1 -1
@@ -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" );
arch/mips/pci/pci-bcm63xx.c +1 -1
@@ -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 ;
arch/mips/pci/pci-rt2880.c +1 -1
@@ -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;
arch/mips/pic32/pic32mzda/early_console.c +1 -1
@@ -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 )
arch/mips/pic32/pic32mzda/early_pin.c +2 -2
@@ -122,7 +122,7 @@ static const structvoid 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 structvoid 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++) {
arch/mips/pmcs-msp71xx/msp_serial.c +2 -2
@@ -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 ;
arch/mips/ralink/irq.c +1 -1
@@ -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" );
arch/mips/ralink/of.c +1 -1
@@ -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 )
arch/mips/rb532/devices.c +1 -1
@@ -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" );
arch/mips/rb532/gpio.c +1 -1
@@ -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" );
arch/mips/rb532/prom.c +1 -1
@@ -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) {
arch/mips/rb532/setup.c +1 -1
@@ -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" );
arch/mips/sni/rm200.c +2 -2
@@ -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 ;
arch/parisc/include/asm/io.h +2 -3
@@ -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 ioremapextern void iounmap (const volatile void __iomem *addr);
arch/parisc/kernel/perf.c +1 -1
@@ -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 ;
arch/powerpc/include/asm/io.h +0 -3
@@ -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))
arch/sh/boards/board-sh7785lcr.c +1 -1
@@ -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 ;
arch/sh/boards/mach-cayman/irq.c +1 -1
@@ -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 ;
arch/sh/boards/mach-cayman/setup.c +1 -1
@@ -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" ); }
arch/sh/boards/mach-sdk7786/fpga.c +1 -1
@@ -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 ;
arch/sh/drivers/heartbeat.c +1 -1
@@ -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" );
arch/sh/drivers/pci/pci-sh5.c +2 -2
@@ -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" ); }
arch/sh/include/asm/io.h +0 -1
@@ -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/*
arch/sh/kernel/cpu/irq/intc-sh5.c +1 -1
@@ -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" ); }
arch/sh/kernel/cpu/sh2/smp-j2.c +2 -2
@@ -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);
arch/sh/kernel/cpu/sh5/clock-sh5.c +1 -1
@@ -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))
arch/sh/kernel/dma-coherent.c +1 -1
@@ -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 ;
arch/sparc/include/asm/io_64.h +0 -1
@@ -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))
arch/unicore32/include/asm/io.h +0 -1
@@ -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
arch/x86/kernel/apb_timer.c +1 -1
@@ -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);
arch/x86/kernel/hpet.c +1 -1
@@ -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 )
arch/x86/kernel/quirks.c +1 -1
@@ -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" );
arch/x86/kernel/tboot.c +1 -1
@@ -354,7 +354,7 @@ static ssize_t tboot_log_read(struct file *file, char __user *user_buf, size_t cvoid *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;
arch/x86/mm/testmmiotrace.c +2 -2
@@ -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); }
arch/x86/pci/mmconfig_64.c +1 -1
@@ -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;
drivers/acpi/acpi_lpit.c +1 -1
@@ -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 ;
drivers/ata/pata_arasan_cf.c +1 -1
@@ -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" );
drivers/ata/pata_octeon_cf.c +3 -3
@@ -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;
drivers/ata/pata_rb532_cf.c +1 -1
@@ -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 ;
drivers/atm/eni.c +1 -7
@@ -31,12 +31,6 @@#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);
drivers/bcma/driver_chipcommon_b.c +1 -1
@@ -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 ;
drivers/bcma/driver_pci_host.c +3 -3
@@ -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);
drivers/bcma/host_soc.c +1 -1
@@ -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 ;
drivers/bcma/scan.c +3 -3
@@ -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 {
drivers/block/umem.c +1 -1
@@ -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" );
drivers/bus/fsl-mc/mc-io.c +2 -2
@@ -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 ; }
drivers/char/agp/generic.c +1 -1
@@ -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
drivers/char/agp/intel-gtt.c +1 -1
@@ -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" );
drivers/char/applicom.c +2 -2
@@ -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 );
drivers/char/hw_random/intel-rng.c +1 -1
@@ -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 ;
drivers/char/hw_random/octeon-rng.c +2 -2
@@ -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)
drivers/clk/renesas/clk-rz.c +2 -2
@@ -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);
drivers/clocksource/sh_cmt.c +1 -1
@@ -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 ;
drivers/clocksource/sh_mtu2.c +1 -1
@@ -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 ;
drivers/clocksource/sh_tmu.c +1 -1
@@ -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 ;
drivers/cpufreq/pcc-cpufreq.c +1 -1
@@ -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" );
drivers/crypto/hifn_795x.c +1 -1
@@ -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;
drivers/dma/altera-msgdma.c +2 -2
@@ -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 ; }
drivers/edac/i3000_edac.c +1 -1
@@ -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);
drivers/edac/i3200_edac.c +1 -1
@@ -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);
drivers/edac/i82975x_edac.c +1 -1
@@ -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;
drivers/edac/ie31200_edac.c +1 -1
@@ -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);
drivers/edac/x38_edac.c +1 -1
@@ -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);
drivers/firewire/nosy.c +1 -1
@@ -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" );
drivers/firmware/broadcom/bcm47xx_nvram.c +1 -1
@@ -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 ;
drivers/gpu/drm/gma500/gtt.c +1 -1
@@ -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" );
drivers/gpu/drm/gma500/psb_drv.c +1 -1
@@ -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;
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -1
@@ -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 ;
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -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) {
drivers/gpu/drm/msm/msm_drv.c +1 -1
@@ -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 );
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
@@ -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 ;
drivers/gpu/drm/sti/sti_dvo.c +1 -1
@@ -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 ;
drivers/gpu/drm/sti/sti_hda.c +2 -2
@@ -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 ;
drivers/gpu/drm/sti/sti_hdmi.c +1 -1
@@ -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;
drivers/gpu/drm/sti/sti_tvout.c +1 -1
@@ -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 ;
drivers/gpu/drm/sti/sti_vtg.c +1 -1
@@ -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 ;
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -1
@@ -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 ;
drivers/gpu/drm/ttm/ttm_bo_util.c +2 -2
@@ -218,7 +218,7 @@ static int ttm_mem_reg_ioremap(struct ttm_bo_device *bdev, struct ttm_mem_reg *mif (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 ;
drivers/hwmon/i5k_amb.c +1 -1
@@ -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;
drivers/i2c/busses/i2c-highlander.c +1 -1
@@ -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;
drivers/i2c/busses/i2c-pmcmsp.c +1 -1
@@ -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,
drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 -1
@@ -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;
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +2 -2
@@ -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",
drivers/infiniband/hw/bnxt_re/qplib_res.c +1 -1
@@ -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,
drivers/infiniband/hw/hfi1/pcie.c +2 -2
@@ -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) {
drivers/infiniband/hw/qib/qib_iba7322.c +1 -1
@@ -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 ;
drivers/infiniband/hw/qib/qib_init.c +2 -2
@@ -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;
drivers/infiniband/hw/qib/qib_pcie.c +1 -1
@@ -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 ;
drivers/input/keyboard/pxa930_rotary.c +1 -1
@@ -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 ;
drivers/input/keyboard/sh_keysc.c +1 -1
@@ -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 ;
drivers/input/mouse/pxa930_trkball.c +1 -1
@@ -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 ;
drivers/input/serio/gscps2.c +1 -1
@@ -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);
drivers/iommu/amd_iommu_init.c +1 -1
@@ -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)
drivers/ipack/carriers/tpci200.c +2 -2
@@ -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) {
drivers/ipack/devices/ipoctal.c +3 -3
@@ -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,
drivers/irqchip/irq-mips-gic.c +1 -1
@@ -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 ;
drivers/irqchip/irq-renesas-intc-irqpin.c +1 -1
@@ -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" );
drivers/media/common/videobuf2/videobuf2-vmalloc.c +1 -1
@@ -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 );
drivers/media/pci/cx18/cx18-driver.c +1 -1
@@ -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" );
drivers/media/pci/ivtv/ivtv-driver.c +3 -3
@@ -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" );
drivers/media/platform/davinci/dm355_ccdc.c +1 -1
@@ -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;
drivers/media/platform/davinci/dm644x_ccdc.c +1 -1
@@ -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;
drivers/media/platform/davinci/isif.c +1 -1
@@ -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;
drivers/media/platform/tegra-cec/tegra_cec.c +1 -1
@@ -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) {
drivers/misc/cardreader/rtsx_pcr.c +1 -1
@@ -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;
drivers/misc/mic/scif/scif_nodeqp.c +1 -1
@@ -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);
drivers/misc/pti.c +1 -1
@@ -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 ;
drivers/mmc/host/sdhci-acpi.c +1 -1
@@ -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 ;
drivers/mmc/host/via-sdmmc.c +1 -1
@@ -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;
drivers/mtd/devices/bcm47xxsflash.c +1 -1
@@ -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) {
drivers/mtd/maps/amd76xrom.c +1 -1
@@ -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);
drivers/mtd/maps/ck804xrom.c +1 -1
@@ -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);
drivers/mtd/maps/esb2rom.c +1 -1
@@ -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);
drivers/mtd/maps/ichxrom.c +1 -1
@@ -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);
drivers/mtd/maps/intel_vr_nor.c +2 -2
@@ -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;
drivers/mtd/maps/l440gx.c +1 -1
@@ -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" );
drivers/mtd/maps/netsc520.c +2 -2
@@ -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 ; }
drivers/mtd/maps/nettel.c +4 -4
@@ -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 ;
drivers/mtd/maps/pci.c +2 -2
@@ -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 ;
drivers/mtd/maps/sc520cdp.c +4 -4
@@ -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]);
drivers/mtd/maps/scb2_flash.c +1 -1
@@ -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)
drivers/mtd/maps/ts5500_flash.c +2 -2
@@ -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; }
drivers/mtd/nand/raw/au1550nd.c +1 -1
@@ -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 ;
drivers/mtd/nand/raw/denali_pci.c +3 -3
@@ -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; }
drivers/mtd/nand/raw/fsl_upm.c +1 -1
@@ -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 ;
drivers/net/can/at91_can.c +1 -1
@@ -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;
drivers/net/can/cc770/cc770_isa.c +1 -1
@@ -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;
drivers/net/can/sja1000/sja1000_isa.c +1 -1
@@ -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;
drivers/net/can/sja1000/sja1000_platform.c +1 -1
@@ -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 ;
drivers/net/can/softing/softing_main.c +1 -1
@@ -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;
drivers/net/ethernet/alacritech/slicoss.c +1 -1
@@ -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" );
drivers/net/ethernet/altera/altera_tse_main.c +2 -2
@@ -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 ; }
drivers/net/ethernet/amd/au1000_eth.c +3 -3
@@ -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 ;
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +1 -1
@@ -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;
drivers/net/ethernet/atheros/ag71xx.c +1 -2
@@ -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;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
@@ -14045,7 +14045,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) {
drivers/net/ethernet/broadcom/sb1250-mac.c +1 -1
@@ -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));
drivers/net/ethernet/brocade/bna/bnad.c +1 -1
@@ -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 ;
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +1 -1
@@ -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 ;
drivers/net/ethernet/dec/tulip/de2104x.c +1 -1
@@ -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",
drivers/net/ethernet/ethoc.c +2 -2
@@ -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" );
drivers/net/ethernet/i825xx/sni_82596.c +3 -3
@@ -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;
drivers/net/ethernet/korina.c +3 -3
@@ -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 ;
drivers/net/ethernet/lantiq_etop.c +1 -1
@@ -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",
drivers/net/ethernet/marvell/skge.c +1 -1
@@ -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;
drivers/net/ethernet/marvell/sky2.c +1 -1
@@ -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;
drivers/net/ethernet/natsemi/ns83820.c +1 -1
@@ -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,
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c +4 -4
@@ -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 ;
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c +3 -3
@@ -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",
drivers/net/ethernet/sfc/ef10.c +1 -1
@@ -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",
drivers/net/ethernet/sfc/efx.c +1 -1
@@ -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",
drivers/net/ethernet/sfc/falcon/efx.c +1 -1
@@ -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",
drivers/net/ethernet/smsc/smsc911x.c +1 -1
@@ -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;
drivers/net/ethernet/ti/netcp_core.c +1 -1
@@ -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);
drivers/net/ethernet/xilinx/ll_temac_main.c +2 -2
@@ -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,
drivers/net/fddi/defxx.c +1 -1
@@ -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 ;
drivers/net/fddi/defza.c +1 -1
@@ -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 ;
drivers/net/fjes/fjes_hw.c +1 -1
@@ -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; }
drivers/net/wan/wanxl.c +2 -2
@@ -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);
drivers/net/wireless/ath/ath10k/ahb.c +2 -2
@@ -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" );
drivers/net/wireless/ath/ath5k/ahb.c +1 -1
@@ -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 ;
drivers/net/wireless/ath/ath9k/ahb.c +1 -1
@@ -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 ;
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2 -2
@@ -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,
drivers/net/wireless/intel/ipw2x00/ipw2100.c +1 -1
@@ -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; }
drivers/opp/ti-opp-supply.c +1 -1
@@ -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 ;
drivers/parisc/ccio-dma.c +1 -1
@@ -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 ;
drivers/parisc/dino.c +1 -1
@@ -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);
drivers/parisc/eisa.c +2 -2
@@ -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,
drivers/parisc/iosapic.c +1 -1
@@ -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 ;
drivers/parisc/lba_pci.c +4 -4
@@ -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 */
drivers/parisc/sba_iommu.c +2 -2
@@ -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
drivers/pci/controller/dwc/pci-dra7xx.c +1 -1
@@ -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 ;
drivers/pci/controller/dwc/pcie-designware-ep.c +1 -1
@@ -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 ;
drivers/pci/msi.c +1 -1
@@ -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,
drivers/pci/pci.c +1 -1
@@ -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);
drivers/pci/quirks.c +2 -2
@@ -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 ;
drivers/pinctrl/bcm/pinctrl-ns2-mux.c +1 -1
@@ -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" );
drivers/pinctrl/bcm/pinctrl-nsp-mux.c +1 -1
@@ -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" );
drivers/pinctrl/freescale/pinctrl-imx1-core.c +1 -1
@@ -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 ;
drivers/pinctrl/pinctrl-amd.c +1 -1
@@ -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 ;
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -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 ;
drivers/platform/x86/intel_telemetry_pltdrv.c +2 -2
@@ -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) {
drivers/platform/x86/pmc_atom.c +1 -1
@@ -481,7 +481,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 ;
drivers/platform/x86/samsung-laptop.c +2 -2
@@ -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 ;
drivers/regulator/ti-abb-regulator.c +2 -2
@@ -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);
drivers/rtc/rtc-sh.c +1 -1
@@ -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 ;
drivers/scsi/aic7xxx/aic79xx_osm_pci.c +1 -1
@@ -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 );
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +1 -1
@@ -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 );
drivers/scsi/arcmsr/arcmsr_hba.c +1 -1
@@ -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;
drivers/scsi/be2iscsi/be_main.c +3 -3
@@ -453,14 +453,14 @@ static int beiscsi_map_pci_bars(struct beiscsi_hba *phba,u8 __iomem *addr;int pcicfg_reg; - addr =ioremap_nocache (pci_resource_start (pcidev,2 ), + addr =ioremap (pci_resource_start (pcidev,2 ),pci_resource_len (pcidev,2 ));if (addr ==NULL )return -ENOMEM ; phba->ctrl.csr = addr; phba->csr_va = addr; - addr =ioremap_nocache (pci_resource_start (pcidev,4 ),128 *1024 ); + addr =ioremap (pci_resource_start (pcidev,4 ),128 *1024 );if (addr ==NULL ) goto pci_map_err; phba->ctrl.db = addr;
@@ -471,7 +471,7 @@ static int beiscsi_map_pci_bars(struct beiscsi_hba *phba,else pcicfg_reg =0 ; - addr =ioremap_nocache (pci_resource_start (pcidev, pcicfg_reg), + addr =ioremap (pci_resource_start (pcidev, pcicfg_reg),pci_resource_len (pcidev, pcicfg_reg));if (addr ==NULL )
drivers/scsi/bnx2fc/bnx2fc_hwi.c +1 -1
@@ -1414,7 +1414,7 @@ int bnx2fc_map_doorbell(struct bnx2fc_rport *tgt) reg_base =pci_resource_start (hba->pcidev,BNX2X_DOORBELL_PCI_BAR ); reg_off = (1 <<BNX2X_DB_SHIFT ) * (context_id &0x1FFFF ); - tgt->ctx_base =ioremap_nocache (reg_base + reg_off,4 ); + tgt->ctx_base =ioremap (reg_base + reg_off,4 );if (!tgt->ctx_base)return -ENOMEM ;return 0 ;
drivers/scsi/bnx2i/bnx2i_hwi.c +2 -2
@@ -2715,7 +2715,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep) reg_base =pci_resource_start (ep->hba->pcidev,BNX2X_DOORBELL_PCI_BAR ); reg_off = (1 <<BNX2X_DB_SHIFT ) * (cid_num &0x1FFFF ); - ep->qp.ctx_base =ioremap_nocache (reg_base + reg_off,4 ); + ep->qp.ctx_base =ioremap (reg_base + reg_off,4 );if (!ep->qp.ctx_base)return -ENOMEM ; goto arm_cq;
@@ -2736,7 +2736,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep)/* 5709 device in normal node and 5706/5708 devices */ reg_off =CTX_OFFSET + (MB_KERNEL_CTX_SIZE * cid_num); - ep->qp.ctx_base =ioremap_nocache (ep->hba->reg_base + reg_off, + ep->qp.ctx_base =ioremap (ep->hba->reg_base + reg_off,MB_KERNEL_CTX_SIZE );if (!ep->qp.ctx_base)return -ENOMEM ;
drivers/scsi/csiostor/csio_init.c +1 -1
@@ -529,7 +529,7 @@ static struct csio_hw *csio_hw_alloc(struct pci_dev *pdev) goto err_free_hw;/* Get the start address of registers from BAR 0 */ - hw->regstart =ioremap_nocache (pci_resource_start (pdev,0 ), + hw->regstart =ioremap (pci_resource_start (pdev,0 ),pci_resource_len (pdev,0 ));if (!hw->regstart) { csio_err(hw, "Could not map BAR 0, regstart = %p\n",
drivers/scsi/hpsa.c +1 -1
@@ -6876,7 +6876,7 @@ static void __iomem *remap_pci_mem(ulong base, ulong size) {ulong page_base = ((ulong ) base) &PAGE_MASK ;ulong page_offs = ((ulong ) base) - page_base; -void __iomem *page_remapped =ioremap_nocache (page_base, +void __iomem *page_remapped =ioremap (page_base, page_offs + size);return page_remapped ? (page_remapped + page_offs) :NULL ;
drivers/scsi/lasi700.c +1 -1
@@ -98,7 +98,7 @@ lasi700_probe(struct parisc_device *dev) hostdata->dev = &dev->dev;dma_set_mask (&dev->dev,DMA_BIT_MASK (32 )); - hostdata->base =ioremap_nocache (base,0x100 ); + hostdata->base =ioremap (base,0x100 ); hostdata->differential =0 ;if (dev->id.sversion ==LASI_700_SVERSION ) {
drivers/scsi/megaraid/megaraid_mbox.c +1 -1
@@ -731,7 +731,7 @@ megaraid_init_mbox(adapter_t *adapter) goto out_free_raid_dev; } - raid_dev->baseaddr =ioremap_nocache (raid_dev->baseport,128 ); + raid_dev->baseaddr =ioremap (raid_dev->baseport,128 );if (!raid_dev->baseaddr) {
drivers/scsi/megaraid/megaraid_sas_base.c +1 -1
@@ -5875,7 +5875,7 @@ static int megasas_init_fw(struct megasas_instance *instance) } base_addr =pci_resource_start (instance->pdev, instance->bar); - instance->reg_set =ioremap_nocache (base_addr,8192 ); + instance->reg_set =ioremap (base_addr,8192 );if (!instance->reg_set) {dev_printk (KERN_DEBUG , &instance->pdev->dev,"Failed to map IO mem\n" );
drivers/scsi/myrb.c +1 -1
@@ -3531,7 +3531,7 @@ static struct myrb_hba *myrb_detect(struct pci_dev *pdev,spin_lock_init (&cb->queue_lock);if (mmio_size <PAGE_SIZE ) mmio_size =PAGE_SIZE ; - cb->mmio_base =ioremap_nocache (cb->pci_addr &PAGE_MASK , mmio_size); + cb->mmio_base =ioremap (cb->pci_addr &PAGE_MASK , mmio_size);if (cb->mmio_base ==NULL ) {dev_err (&pdev->dev,"Unable to map Controller Register Window\n" );
drivers/scsi/myrs.c +1 -1
@@ -2311,7 +2311,7 @@ static struct myrs_hba *myrs_detect(struct pci_dev *pdev,/* Map the Controller Register Window. */ if (mmio_size <PAGE_SIZE ) mmio_size =PAGE_SIZE ; - cs->mmio_base =ioremap_nocache (cs->pci_addr &PAGE_MASK , mmio_size); + cs->mmio_base =ioremap (cs->pci_addr &PAGE_MASK , mmio_size);if (cs->mmio_base ==NULL ) {dev_err (&pdev->dev,"Unable to map Controller Register Window\n" );
drivers/scsi/pcmcia/nsp_cs.c +1 -1
@@ -1560,7 +1560,7 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev, void *priv_data) goto next_entry; data->MmioAddress = (unsigned long ) -ioremap_nocache (p_dev->resource[2 ]->start, +ioremap (p_dev->resource[2 ]->start,resource_size (p_dev->resource[2 ])); data->MmioLength =resource_size (p_dev->resource[2 ]); }
drivers/scsi/qla2xxx/qla_mr.c +2 -2
@@ -789,7 +789,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha) } ha->cregbase = -ioremap_nocache (pci_resource_start (ha->pdev,0 ),BAR0_LEN_FX00 ); +ioremap (pci_resource_start (ha->pdev,0 ),BAR0_LEN_FX00 );if (!ha->cregbase) {ql_log_pci (ql_log_fatal, ha->pdev,0x0128 ,"cannot remap MMIO (%s), aborting\n" ,pci_name (ha->pdev));
@@ -810,7 +810,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha) } ha->iobase = -ioremap_nocache (pci_resource_start (ha->pdev,2 ),BAR2_LEN_FX00 ); +ioremap (pci_resource_start (ha->pdev,2 ),BAR2_LEN_FX00 );if (!ha->iobase) {ql_log_pci (ql_log_fatal, ha->pdev,0x012b ,"cannot remap MMIO (%s), aborting\n" ,pci_name (ha->pdev));
drivers/scsi/smartpqi/smartpqi_init.c +1 -1
@@ -7457,7 +7457,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info) goto disable_device; } - ctrl_info->iomem_base =ioremap_nocache (pci_resource_start ( + ctrl_info->iomem_base =ioremap (pci_resource_start ( ctrl_info->pci_dev,0 ),sizeof (struct pqi_ctrl_registers ));if (!ctrl_info->iomem_base) {
drivers/scsi/sni_53c710.c +1 -1
@@ -71,7 +71,7 @@ static int snirm710_probe(struct platform_device *dev) hostdata->dev = &dev->dev;dma_set_mask (&dev->dev,DMA_BIT_MASK (32 )); - hostdata->base =ioremap_nocache (base,0x100 ); + hostdata->base =ioremap (base,0x100 ); hostdata->differential =0 ; hostdata->clock =SNIRM710_CLOCK ;
drivers/scsi/sun3x_esp.c +2 -2
@@ -190,7 +190,7 @@ static int esp_sun3x_probe(struct platform_device *dev)if (!res || !res->start) goto fail_unlink; - esp->regs =ioremap_nocache (res->start,0x20 ); + esp->regs =ioremap (res->start,0x20 );if (!esp->regs) goto fail_unmap_regs;
@@ -198,7 +198,7 @@ static int esp_sun3x_probe(struct platform_device *dev)if (!res || !res->start) goto fail_unmap_regs; - esp->dma_regs =ioremap_nocache (res->start,0x10 ); + esp->dma_regs =ioremap (res->start,0x10 ); esp->command_block = dma_alloc_coherent(esp->dev, 16, &esp->command_block_dma,
drivers/scsi/zalon.c +1 -1
@@ -89,7 +89,7 @@ zalon_probe(struct parisc_device *dev)struct gsc_irq gsc_irq;u32 zalon_vers;int error = -ENODEV ; -void __iomem *zalon =ioremap_nocache (dev->hpa.start,4096 ); +void __iomem *zalon =ioremap (dev->hpa.start,4096 );void __iomem *io_port = zalon +GSC_SCSI_ZALON_OFFSET ;static int unit =0 ;struct Scsi_Host *host;
drivers/scsi/zorro_esp.c +3 -3
@@ -801,7 +801,7 @@ static int zorro_esp_probe(struct zorro_dev *z,/* additional setup required for Fastlane */ if (zep->zorro3 && ent->driver_data ==ZORRO_BLZ1230II ) {/* map full address space up to ESP base for DMA */ - zep->board_base =ioremap_nocache (board, + zep->board_base =ioremap (board,FASTLANE_ESP_ADDR -1 );if (!zep->board_base) {pr_err ("Cannot allocate board address space\n" );
@@ -816,7 +816,7 @@ static int zorro_esp_probe(struct zorro_dev *z, esp->ops = zdd->esp_ops;if (ioaddr >0xffffff ) - esp->regs =ioremap_nocache (ioaddr,0x20 ); + esp->regs =ioremap (ioaddr,0x20 );else /* ZorroII address space remapped nocache by early startup */ esp->regs =ZTWO_VADDR (ioaddr);
@@ -842,7 +842,7 @@ static int zorro_esp_probe(struct zorro_dev *z,* Only Fastlane Z3 for now - add switch for correct struct * dma_registers size if adding any more */ - esp->dma_regs =ioremap_nocache (dmaaddr, + esp->dma_regs =ioremap (dmaaddr,sizeof (struct fastlane_dma_registers )); }else /* ZorroII address space remapped nocache by early startup */
drivers/sh/clk/core.c +1 -1
@@ -368,7 +368,7 @@ static int clk_establish_mapping(struct clk *clk)if (!mapping->base && mapping->phys) {kref_init (&mapping->ref); - mapping->base =ioremap_nocache (mapping->phys, mapping->len); + mapping->base =ioremap (mapping->phys, mapping->len);if (unlikely (!mapping->base))return -ENXIO ; }else if (mapping->base) {
drivers/sh/intc/core.c +1 -1
@@ -213,7 +213,7 @@ int __init register_intc_controller(struct intc_desc *desc)WARN_ON (resource_type (res) !=IORESOURCE_MEM ); d->window[k].phys = res->start; d->window[k].size =resource_size (res); - d->window[k].virt =ioremap_nocache (res->start, + d->window[k].virt =ioremap (res->start,resource_size (res));if (!d->window[k].virt) goto err2;
drivers/sh/intc/userimask.c +1 -1
@@ -73,7 +73,7 @@ int register_intc_userimask(unsigned long addr)if (unlikely (uimask))return -EBUSY ; - uimask =ioremap_nocache (addr,SZ_4K ); + uimask =ioremap (addr,SZ_4K );if (unlikely (!uimask))return -ENOMEM ;
drivers/soc/tegra/flowctrl.c +1 -1
@@ -219,7 +219,7 @@ static int __init tegra_flowctrl_init(void)return 0 ; } - tegra_flowctrl_base =ioremap_nocache (res.start,resource_size (&res)); + tegra_flowctrl_base =ioremap (res.start,resource_size (&res));if (!tegra_flowctrl_base)return -ENXIO ;
drivers/soc/tegra/fuse/fuse-tegra.c +1 -1
@@ -408,7 +408,7 @@ static int __init tegra_init_fuse(void) } } - fuse->base =ioremap_nocache (regs.start,resource_size (®s)); + fuse->base =ioremap (regs.start,resource_size (®s));if (!fuse->base) {pr_err ("failed to map FUSE registers\n" );return -ENXIO ;
drivers/soc/tegra/fuse/tegra-apbmisc.c +2 -2
@@ -159,11 +159,11 @@ void __init tegra_init_apbmisc(void) } } - apbmisc_base =ioremap_nocache (apbmisc.start,resource_size (&apbmisc)); + apbmisc_base =ioremap (apbmisc.start,resource_size (&apbmisc));if (!apbmisc_base)pr_err ("failed to map APBMISC registers\n" ); - strapping_base =ioremap_nocache (straps.start,resource_size (&straps)); + strapping_base =ioremap (straps.start,resource_size (&straps));if (!strapping_base)pr_err ("failed to map strapping options registers\n" );
drivers/soc/tegra/pmc.c +2 -2
@@ -2826,7 +2826,7 @@ static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc,of_address_to_resource (np, index, ®s); - wake =ioremap_nocache (regs.start,resource_size (®s)); + wake =ioremap (regs.start,resource_size (®s));if (!wake) {dev_err (pmc->dev,"failed to map PMC wake registers\n" );return ;
@@ -3097,7 +3097,7 @@ static int __init tegra_pmc_early_init(void) } } - pmc->base =ioremap_nocache (regs.start,resource_size (®s)); + pmc->base =ioremap (regs.start,resource_size (®s));if (!pmc->base) {pr_err ("failed to map PMC registers\n" );of_node_put (np);
drivers/soc/xilinx/xlnx_vcu.c +2 -2
@@ -511,7 +511,7 @@ static int xvcu_probe(struct platform_device *pdev)return -ENODEV ; } - xvcu->vcu_slcr_ba =devm_ioremap_nocache (&pdev->dev, res->start, + xvcu->vcu_slcr_ba =devm_ioremap (&pdev->dev, res->start,resource_size (res));if (!xvcu->vcu_slcr_ba) {dev_err (&pdev->dev,"vcu_slcr register mapping failed.\n" );
@@ -524,7 +524,7 @@ static int xvcu_probe(struct platform_device *pdev)return -ENODEV ; } - xvcu->logicore_reg_ba =devm_ioremap_nocache (&pdev->dev, res->start, + xvcu->logicore_reg_ba =devm_ioremap (&pdev->dev, res->start,resource_size (res));if (!xvcu->logicore_reg_ba) {dev_err (&pdev->dev,"logicore register mapping failed.\n" );
drivers/spi/spi-dw-mid.c +1 -1
@@ -301,7 +301,7 @@ int dw_spi_mid_init(struct dw_spi *dws)void __iomem *clk_reg;u32 clk_cdiv; - clk_reg =ioremap_nocache (MRST_CLK_SPI_REG ,16 ); + clk_reg =ioremap (MRST_CLK_SPI_REG ,16 );if (!clk_reg)return -ENOMEM ;
drivers/spi/spi-jcore.c +1 -1
@@ -170,7 +170,7 @@ static int jcore_spi_probe(struct platform_device *pdev)if (!devm_request_mem_region (&pdev->dev, res->start,resource_size (res), pdev->name)) goto exit_busy; - hw->base =devm_ioremap_nocache (&pdev->dev, res->start, + hw->base =devm_ioremap (&pdev->dev, res->start,resource_size (res));if (!hw->base) goto exit_busy;
drivers/spi/spi-npcm-fiu.c +1 -1
@@ -603,7 +603,7 @@ static int npcm_fiu_dirmap_create(struct spi_mem_dirmap_desc *desc)if (!chip->flash_region_mapped_ptr) { chip->flash_region_mapped_ptr = -devm_ioremap_nocache (fiu->dev, (fiu->res_mem->start + +devm_ioremap (fiu->dev, (fiu->res_mem->start + (fiu->info->max_map_size * desc->mem->spi->chip_select)), (u32 )desc->info.length);
drivers/ssb/driver_extif.c +1 -1
@@ -63,7 +63,7 @@ int ssb_extif_serial_init(struct ssb_extif *extif, struct ssb_serial_port *portsfor (i =0 ; i <2 ; i++) {void __iomem *uart_regs; - uart_regs =ioremap_nocache (SSB_EUART ,16 ); + uart_regs =ioremap (SSB_EUART ,16 );if (uart_regs) { uart_regs += (i *8 );
drivers/ssb/driver_pcicore.c +3 -3
@@ -122,7 +122,7 @@ static int ssb_extpci_read_config(struct ssb_pcicore *pc,if (unlikely (!addr)) goto out; err = -ENOMEM ; - mmio =ioremap_nocache (addr, len); + mmio =ioremap (addr, len);if (!mmio) goto out;
@@ -168,7 +168,7 @@ static int ssb_extpci_write_config(struct ssb_pcicore *pc,if (unlikely (!addr)) goto out; err = -ENOMEM ; - mmio =ioremap_nocache (addr, len); + mmio =ioremap (addr, len);if (!mmio) goto out;
@@ -382,7 +382,7 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)/* Ok, ready to run, register it to the system. * The following needs change, if we want to port hostmode * to non-MIPS platform. */ - ssb_pcicore_controller.io_map_base = (unsigned long )ioremap_nocache (SSB_PCI_MEM ,0x04000000 ); + ssb_pcicore_controller.io_map_base = (unsigned long )ioremap (SSB_PCI_MEM ,0x04000000 );set_io_port_base (ssb_pcicore_controller.io_map_base);/* Give some time to the PCI controller to configure itself with the new * values. Not waiting at this point causes crashes of the machine. */
drivers/staging/gasket/gasket_core.c +1 -1
@@ -303,7 +303,7 @@ static int gasket_map_pci_bar(struct gasket_dev *gasket_dev, int bar_num) } gasket_dev->bar_data[bar_num].virt_base = -ioremap_nocache (gasket_dev->bar_data[bar_num].phys_base, +ioremap (gasket_dev->bar_data[bar_num].phys_base, gasket_dev->bar_data[bar_num].length_bytes);if (!gasket_dev->bar_data[bar_num].virt_base) { dev_err(gasket_dev->dev,
drivers/staging/kpc2000/kpc2000/core.c +2 -2
@@ -338,7 +338,7 @@ static int kp2000_pcie_probe(struct pci_dev *pdev, reg_bar_phys_addr =pci_resource_start (pcard->pdev,REG_BAR ); reg_bar_phys_len =pci_resource_len (pcard->pdev,REG_BAR ); - pcard->regs_bar_base =ioremap_nocache (reg_bar_phys_addr,PAGE_SIZE ); + pcard->regs_bar_base =ioremap (reg_bar_phys_addr,PAGE_SIZE );if (!pcard->regs_bar_base) {dev_err (&pcard->pdev->dev,"probe: REG_BAR could not remap memory to virtual space\n" );
@@ -367,7 +367,7 @@ static int kp2000_pcie_probe(struct pci_dev *pdev, dma_bar_phys_addr =pci_resource_start (pcard->pdev,DMA_BAR ); dma_bar_phys_len =pci_resource_len (pcard->pdev,DMA_BAR ); - pcard->dma_bar_base =ioremap_nocache (dma_bar_phys_addr, + pcard->dma_bar_base =ioremap (dma_bar_phys_addr, dma_bar_phys_len);if (!pcard->dma_bar_base) { dev_err(&pcard->pdev->dev,
drivers/staging/kpc2000/kpc2000_i2c.c +1 -1
@@ -659,7 +659,7 @@ static int pi2c_probe(struct platform_device *pldev)if (!res)return -ENXIO ; - priv->smba = (unsigned long )devm_ioremap_nocache (&pldev->dev, + priv->smba = (unsigned long )devm_ioremap (&pldev->dev, res->start,resource_size (res));if (!priv->smba)
drivers/staging/kpc2000/kpc2000_spi.c +1 -1
@@ -464,7 +464,7 @@ kp_spi_probe(struct platform_device *pldev) goto free_master; } - kpspi->base =devm_ioremap_nocache (&pldev->dev, r->start, + kpspi->base =devm_ioremap (&pldev->dev, r->start,resource_size (r)); status =spi_register_master (master);
drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c +1 -1
@@ -122,7 +122,7 @@ int kpc_dma_probe(struct platform_device *pldev) rv = -ENXIO ; goto err_kfree; } - ldev->eng_regs =ioremap_nocache (r->start,resource_size (r)); + ldev->eng_regs =ioremap (r->start,resource_size (r));if (!ldev->eng_regs) {dev_err (&ldev->pldev->dev,"%s: failed to ioremap engine regs!\n" , __func__); rv = -ENXIO ;
drivers/staging/media/allegro-dvt/allegro-core.c +2 -2
@@ -2914,7 +2914,7 @@ static int allegro_probe(struct platform_device *pdev) "regs resource missing from device tree\n");return -EINVAL ; } - regs =devm_ioremap_nocache (&pdev->dev, res->start,resource_size (res)); + regs =devm_ioremap (&pdev->dev, res->start,resource_size (res));if (IS_ERR (regs)) {dev_err (&pdev->dev,"failed to map registers\n" );return PTR_ERR (regs);
@@ -2932,7 +2932,7 @@ static int allegro_probe(struct platform_device *pdev) "sram resource missing from device tree\n");return -EINVAL ; } - sram_regs =devm_ioremap_nocache (&pdev->dev, + sram_regs =devm_ioremap (&pdev->dev, sram_res->start,resource_size (sram_res));if (IS_ERR (sram_regs)) {
drivers/staging/qlge/qlge_main.c +2 -2
@@ -4455,7 +4455,7 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev, pdev->needs_freset =1 ;pci_save_state (pdev); qdev->reg_base = -ioremap_nocache (pci_resource_start (pdev,1 ), +ioremap (pci_resource_start (pdev,1 ),pci_resource_len (pdev,1 ));if (!qdev->reg_base) {dev_err (&pdev->dev,"Register mapping failed.\n" );
@@ -4465,7 +4465,7 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev, qdev->doorbell_area_size =pci_resource_len (pdev,3 ); qdev->doorbell_area = -ioremap_nocache (pci_resource_start (pdev,3 ), +ioremap (pci_resource_start (pdev,3 ),pci_resource_len (pdev,3 ));if (!qdev->doorbell_area) {dev_err (&pdev->dev,"Doorbell register mapping failed.\n" );
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -1
@@ -2463,7 +2463,7 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev, } - ioaddr = (unsigned long )ioremap_nocache (pmem_start, pmem_len); + ioaddr = (unsigned long )ioremap (pmem_start, pmem_len);if (ioaddr == (unsigned long )NULL ) {netdev_err (dev,"ioremap failed!" ); goto err_rel_mem;
drivers/staging/rts5208/rtsx.c +1 -1
@@ -858,7 +858,7 @@ static int rtsx_probe(struct pci_dev *pci,dev_info (&pci->dev,"Resource length: 0x%x\n" , (unsigned int )pci_resource_len (pci,0 )); dev->addr =pci_resource_start (pci,0 ); - dev->remap_addr =ioremap_nocache (dev->addr,pci_resource_len (pci,0 )); + dev->remap_addr =ioremap (dev->addr,pci_resource_len (pci,0 ));if (!dev->remap_addr) {dev_err (&pci->dev,"ioremap error\n" ); err = -ENXIO ;
drivers/staging/sm750fb/sm750_hw.c +1 -1
@@ -50,7 +50,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) }/* now map mmio and vidmem */ - sm750_dev->pvReg =ioremap_nocache (sm750_dev->vidreg_start, + sm750_dev->pvReg =ioremap (sm750_dev->vidreg_start, sm750_dev->vidreg_size);if (!sm750_dev->pvReg) {pr_err ("mmio failed\n" );
drivers/staging/uwb/whc-rc.c +3 -3
@@ -216,11 +216,11 @@ int whcrc_setup_rc_umc(struct whcrc *whcrc) goto error_request_region; } - whcrc->rc_base =ioremap_nocache (whcrc->area, whcrc->rc_len); + whcrc->rc_base =ioremap (whcrc->area, whcrc->rc_len);if (whcrc->rc_base ==NULL ) {dev_err (dev,"can't ioremap registers (%zu bytes @ 0x%lx): %d\n" , whcrc->rc_len, whcrc->area, result); - goto error_ioremap_nocache; + goto error_ioremap; } result = request_irq(umc_dev->irq, whcrc_irq_cb, IRQF_SHARED,
@@ -254,7 +254,7 @@ int whcrc_setup_rc_umc(struct whcrc *whcrc)free_irq (umc_dev->irq, whcrc); error_request_irq:iounmap (whcrc->rc_base); -error_ioremap_nocache: +error_ioremap:release_mem_region (whcrc->area, whcrc->rc_len); error_request_region:return result;
drivers/tc/tc.c +1 -1
@@ -47,7 +47,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)for (slot =0 ; slot < tbus->num_tcslots; slot++) { slotaddr = tbus->slot_base + slot * slotsize; extslotaddr = tbus->ext_slot_base + slot * extslotsize; - module =ioremap_nocache (slotaddr, slotsize); + module =ioremap (slotaddr, slotsize);BUG_ON (!module); offset =TC_OLDCARD ;
drivers/tty/cyclades.c +5 -5
@@ -3256,7 +3256,7 @@ static int __init cy_detect_isa(void)return nboard;/* probe for CD1400... */ - cy_isa_address =ioremap_nocache (isa_address, CyISA_Ywin); + cy_isa_address =ioremap (isa_address, CyISA_Ywin);if (cy_isa_address ==NULL ) {printk (KERN_ERR "Cyclom-Y/ISA: can't remap base " "address\n" );
@@ -3690,13 +3690,13 @@ static int cy_pci_probe(struct pci_dev *pdev, device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) { card_name ="Cyclom-Y" ; - addr0 =ioremap_nocache (pci_resource_start (pdev,0 ), + addr0 =ioremap (pci_resource_start (pdev,0 ), CyPCI_Yctl);if (addr0 ==NULL ) {dev_err (&pdev->dev,"can't remap ctl region\n" ); goto err_reg; } - addr2 =ioremap_nocache (pci_resource_start (pdev,2 ), + addr2 =ioremap (pci_resource_start (pdev,2 ), CyPCI_Ywin);if (addr2 ==NULL ) {dev_err (&pdev->dev,"can't remap base region\n" );
@@ -3712,7 +3712,7 @@ static int cy_pci_probe(struct pci_dev *pdev, }else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {struct RUNTIME_9060 __iomem *ctl_addr; - ctl_addr = addr0 =ioremap_nocache (pci_resource_start (pdev,0 ), + ctl_addr = addr0 =ioremap (pci_resource_start (pdev,0 ), CyPCI_Zctl);if (addr0 ==NULL ) {dev_err (&pdev->dev,"can't remap ctl region\n" );
@@ -3727,7 +3727,7 @@ static int cy_pci_probe(struct pci_dev *pdev, mailbox =readl (&ctl_addr->mail_box_0); - addr2 =ioremap_nocache (pci_resource_start (pdev,2 ), + addr2 =ioremap (pci_resource_start (pdev,2 ), mailbox ==ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);if (addr2 ==NULL ) {dev_err (&pdev->dev,"can't remap base region\n" );
drivers/tty/mips_ejtag_fdc.c +1 -1
@@ -898,7 +898,7 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)atomic_set (&priv->xmit_total,0 );raw_spin_lock_init (&priv->lock); - priv->reg =devm_ioremap_nocache (priv->dev, dev->res.start, + priv->reg =devm_ioremap (priv->dev, dev->res.start,resource_size (&dev->res));if (!priv->reg) { dev_err(priv->dev, "ioremap failed for resource %pR\n",
drivers/tty/moxa.c +2 -2
@@ -961,7 +961,7 @@ static int moxa_pci_probe(struct pci_dev *pdev, goto err; } - board->basemem =ioremap_nocache (pci_resource_start (pdev,2 ),0x4000 ); + board->basemem =ioremap (pci_resource_start (pdev,2 ),0x4000 );if (board->basemem ==NULL ) {dev_err (&pdev->dev,"can't remap io space 2\n" ); retval = -ENOMEM ;
@@ -1071,7 +1071,7 @@ static int __init moxa_init(void) brd->numPorts = type[i] ==MOXA_BOARD_C218_ISA ?8 : numports[i]; brd->busType =MOXA_BUS_TYPE_ISA ; - brd->basemem =ioremap_nocache (baseaddr[i],0x4000 ); + brd->basemem =ioremap (baseaddr[i],0x4000 );if (!brd->basemem) {printk (KERN_ERR "MOXA: can't remap %lx\n" , baseaddr[i]);
drivers/tty/serial/8250/8250_gsc.c +1 -1
@@ -55,7 +55,7 @@ static int __init serial_init_chip(struct parisc_device *dev) uart.port.uartclk = (dev->id.sversion !=0xad ) ?7272727 :1843200 ; uart.port.mapbase = address; - uart.port.membase =ioremap_nocache (address,16 ); + uart.port.membase =ioremap (address,16 );if (!uart.port.membase) {dev_warn (&dev->dev,"Failed to map memory\n" );return -ENOMEM ;
drivers/tty/serial/8250/8250_omap.c +1 -1
@@ -1147,7 +1147,7 @@ static int omap8250_probe(struct platform_device *pdev)if (!priv)return -ENOMEM ; - membase =devm_ioremap_nocache (&pdev->dev, regs->start, + membase =devm_ioremap (&pdev->dev, regs->start,resource_size (regs));if (!membase)return -ENODEV ;
drivers/tty/serial/8250/8250_pci.c +3 -3
@@ -275,7 +275,7 @@ static int pci_plx9050_init(struct pci_dev *dev)/* * enable/disable interrupts */ - p =ioremap_nocache (pci_resource_start (dev,0 ),0x80 ); + p =ioremap (pci_resource_start (dev,0 ),0x80 );if (p ==NULL )return -ENOMEM ;writel (irq_config, p +0x4c );
@@ -299,7 +299,7 @@ static void pci_plx9050_exit(struct pci_dev *dev)/* * disable interrupts */ - p =ioremap_nocache (pci_resource_start (dev,0 ),0x80 ); + p =ioremap (pci_resource_start (dev,0 ),0x80 );
Lines of this file are not shown. View the raw message.
drivers/usb/gadget/udc/amd5536udc_pci.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/usb/roles/intel-xhci-usb-role-switch.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/vfio/platform/reset/vfio_platform_amdxgbe.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/vfio/platform/vfio_platform_common.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/intelfb/intelfbdrv.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/matrox/matroxfb_base.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/vermilion/vermilion.c +2 -2
Lines of this file are not shown. View the raw message.
scripts/coccinelle/free/devm_free.cocci +0 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.20.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH 2/2] remove ioremap_nocache and devm_ioremap_nocache
Quoted 5 lines · Christoph Hellwig
ioremap has provided non-cached semantics by default since the Linux 2.6 days, so remove the additional
ioremap_nocacheinterface.Signed-off-by Christoph Hellwig <[email protected]>
Great work, thanks for getting this done!
Quoted 3 lines · Christoph Hellwig
Let me know what you think and if this is something acceptable for just after -rc1.
How many conflicts will this result in generally? I like it, but I'd like to have some idea of whether it ends up being one of those "really painful churn" things?
A couple of conflicts isn't an issue - they'll be trivial to fix. It's the "this causes fifty silly conflicts" that I worry about, partly because it then makes submaintainers inevitably do the wrong thing (ie "I foresee an excessive amount of 'git rebase' rants next release").
Also, it looks like Google doesn't want this to happen. This whole series was marked as spam for me.I'm not sure why, I don't see anything odd that would trigger it, and DKIM and SPF both passed. Maybe it's you, maybe it's Google, and maybe it's the infradead SRS thing.
Linus
Quoted 8 lines · Linus Torvalds
How many conflicts will this result in generally? I like it, but I'd like to have some idea of whether it ends up being one of those "really painful churn" things?
A couple of conflicts isn't an issue - they'll be trivial to fix. It's the "this causes fifty silly conflicts" that I worry about, partly because it then makes submaintainers inevitably do the wrong thing (ie "I foresee an excessive amount of 'git rebase' rants next release").
I had about a dozend and a half conflicts rebasing this weekend, the previous version was approx -rc6 IIRC.
I've pushed this out to the for-next branch and thus linux-next. Let's see if anyone screams.