History

remove ioremap_nocache and devm_ioremap_nocache

ioremap has provided non-cached semantics by default since the Linux 2.6 days, so remove the additional ioremap_nocache interface.

Christoph Hellwig committed 6 years ago

Commit 4bdc0d61 parent d23cc63368 files · +508 −581Browse files

Unified · Split

368 files
  1. Documentation/driver-api/driver-model/devres.rst +0 −1
  2. Documentation/sound/kernel-api/writing-an-alsa-driver.rst +1 −1
  3. Documentation/x86/pat.rst +0 −2
  4. arch/alpha/include/asm/io.h +2 −8
  5. arch/arm/include/asm/io.h +0 −8
  6. arch/arm/mach-bcm/platsmp.c +2 −2
  7. arch/arm/mach-davinci/devices.c +1 −1
  8. arch/arm/mach-pxa/magician.c +1 −1
  9. arch/arm/mach-shmobile/platsmp-apmu.c +1 −1
  10. arch/arm/mach-shmobile/pm-rcar-gen2.c +1 −1
  11. arch/arm/mach-shmobile/setup-r8a7740.c +4 −4
  12. arch/arm/mach-shmobile/setup-r8a7778.c +1 −1
  13. arch/hexagon/include/asm/io.h +0 −1
  14. arch/ia64/include/asm/vga.h +1 −1
  15. arch/ia64/kernel/cyclone.c +4 −4
  16. arch/m68k/include/asm/kmap.h +0 −1
  17. arch/mips/ar7/clock.c +4 −4
  18. arch/mips/ar7/gpio.c +1 −1
  19. arch/mips/ar7/platform.c +1 −1
  20. arch/mips/ath25/ar2315.c +2 −2
  21. arch/mips/ath25/ar5312.c +3 −3
  22. arch/mips/ath25/board.c +1 −1
  23. arch/mips/ath79/common.c +1 −1
  24. arch/mips/ath79/setup.c +2 −2
  25. arch/mips/cavium-octeon/setup.c +1 −1
  26. arch/mips/generic/board-ocelot.c +1 −1
  27. arch/mips/include/asm/io.h +0 −1
  28. arch/mips/kernel/mips-cm.c +2 −2
  29. arch/mips/kernel/mips-cpc.c +1 −1
  30. arch/mips/lantiq/falcon/sysctrl.c +3 −3
  31. arch/mips/lantiq/irq.c +2 −2
  32. arch/mips/lantiq/xway/sysctrl.c +3 −3
  33. arch/mips/loongson2ef/common/reset.c +2 −2
  34. arch/mips/loongson32/common/prom.c +4 −4
  35. arch/mips/loongson32/common/reset.c +1 −1
  36. arch/mips/loongson32/common/time.c +1 −1
  37. arch/mips/loongson64/reset.c +1 −1
  38. arch/mips/mti-malta/malta-dtshim.c +1 −1
  39. arch/mips/pci/pci-alchemy.c +1 −1
  40. arch/mips/pci/pci-ar2315.c +1 −1
  41. arch/mips/pci/pci-bcm63xx.c +1 −1
  42. arch/mips/pci/pci-rt2880.c +1 −1
  43. arch/mips/pic32/pic32mzda/early_console.c +1 −1
  44. arch/mips/pic32/pic32mzda/early_pin.c +2 −2
  45. arch/mips/pmcs-msp71xx/msp_serial.c +2 −2
  46. arch/mips/ralink/irq.c +1 −1
  47. arch/mips/ralink/of.c +1 −1
  48. arch/mips/rb532/devices.c +1 −1
  49. arch/mips/rb532/gpio.c +1 −1
  50. arch/mips/rb532/prom.c +1 −1
  51. arch/mips/rb532/setup.c +1 −1
  52. arch/mips/sni/rm200.c +2 −2
  53. arch/parisc/include/asm/io.h +2 −3
  54. arch/parisc/kernel/perf.c +1 −1
  55. arch/powerpc/include/asm/io.h +0 −3
  56. arch/sh/boards/board-sh7785lcr.c +1 −1
  57. arch/sh/boards/mach-cayman/irq.c +1 −1
  58. arch/sh/boards/mach-cayman/setup.c +1 −1
  59. arch/sh/boards/mach-sdk7786/fpga.c +1 −1
  60. arch/sh/drivers/heartbeat.c +1 −1
  61. arch/sh/drivers/pci/pci-sh5.c +2 −2
  62. arch/sh/include/asm/io.h +0 −1
  63. arch/sh/kernel/cpu/irq/intc-sh5.c +1 −1
  64. arch/sh/kernel/cpu/sh2/smp-j2.c +2 −2
  65. arch/sh/kernel/cpu/sh5/clock-sh5.c +1 −1
  66. arch/sh/kernel/dma-coherent.c +1 −1
  67. arch/sparc/include/asm/io_64.h +0 −1
  68. arch/unicore32/include/asm/io.h +0 −1
  69. arch/x86/kernel/apb_timer.c +1 −1
  70. arch/x86/kernel/hpet.c +1 −1
  71. arch/x86/kernel/quirks.c +1 −1
  72. arch/x86/kernel/tboot.c +1 −1
  73. arch/x86/mm/testmmiotrace.c +2 −2
  74. arch/x86/pci/mmconfig_64.c +1 −1
  75. drivers/acpi/acpi_lpit.c +1 −1
  76. drivers/ata/pata_arasan_cf.c +1 −1
  77. drivers/ata/pata_octeon_cf.c +3 −3
  78. drivers/ata/pata_rb532_cf.c +1 −1
  79. drivers/atm/eni.c +1 −7
  80. drivers/bcma/driver_chipcommon_b.c +1 −1
  81. drivers/bcma/driver_pci_host.c +3 −3
  82. drivers/bcma/host_soc.c +1 −1
  83. drivers/bcma/scan.c +3 −3
  84. drivers/block/umem.c +1 −1
  85. drivers/bus/fsl-mc/mc-io.c +2 −2
  86. drivers/char/agp/generic.c +1 −1
  87. drivers/char/agp/intel-gtt.c +1 −1
  88. drivers/char/applicom.c +2 −2
  89. drivers/char/hw_random/intel-rng.c +1 −1
  90. drivers/char/hw_random/octeon-rng.c +2 −2
  91. drivers/clk/renesas/clk-rz.c +2 −2
  92. drivers/clocksource/sh_cmt.c +1 −1
  93. drivers/clocksource/sh_mtu2.c +1 −1
  94. drivers/clocksource/sh_tmu.c +1 −1
  95. drivers/cpufreq/pcc-cpufreq.c +1 −1
  96. drivers/crypto/hifn_795x.c +1 −1
  97. drivers/dma/altera-msgdma.c +2 −2
  98. drivers/edac/i3000_edac.c +1 −1
  99. drivers/edac/i3200_edac.c +1 −1
  100. drivers/edac/i82975x_edac.c +1 −1
  101. drivers/edac/ie31200_edac.c +1 −1
  102. drivers/edac/x38_edac.c +1 −1
  103. drivers/firewire/nosy.c +1 −1
  104. drivers/firmware/broadcom/bcm47xx_nvram.c +1 −1
  105. drivers/gpu/drm/gma500/gtt.c +1 −1
  106. drivers/gpu/drm/gma500/psb_drv.c +1 −1
  107. drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 −1
  108. drivers/gpu/drm/i915/i915_gem_gtt.c +1 −1
  109. drivers/gpu/drm/msm/msm_drv.c +1 −1
  110. drivers/gpu/drm/radeon/radeon_ttm.c +1 −1
  111. drivers/gpu/drm/sti/sti_dvo.c +1 −1
  112. drivers/gpu/drm/sti/sti_hda.c +2 −2
  113. drivers/gpu/drm/sti/sti_hdmi.c +1 −1
  114. drivers/gpu/drm/sti/sti_tvout.c +1 −1
  115. drivers/gpu/drm/sti/sti_vtg.c +1 −1
  116. drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 −1
  117. drivers/gpu/drm/ttm/ttm_bo_util.c +2 −2
  118. drivers/hwmon/i5k_amb.c +1 −1
  119. drivers/i2c/busses/i2c-highlander.c +1 −1
  120. drivers/i2c/busses/i2c-pmcmsp.c +1 −1
  121. drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 −1
  122. drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +2 −2
  123. drivers/infiniband/hw/bnxt_re/qplib_res.c +1 −1
  124. drivers/infiniband/hw/hfi1/pcie.c +2 −2
  125. drivers/infiniband/hw/qib/qib_iba7322.c +1 −1
  126. drivers/infiniband/hw/qib/qib_init.c +2 −2
  127. drivers/infiniband/hw/qib/qib_pcie.c +1 −1
  128. drivers/input/keyboard/pxa930_rotary.c +1 −1
  129. drivers/input/keyboard/sh_keysc.c +1 −1
  130. drivers/input/mouse/pxa930_trkball.c +1 −1
  131. drivers/input/serio/gscps2.c +1 −1
  132. drivers/iommu/amd_iommu_init.c +1 −1
  133. drivers/ipack/carriers/tpci200.c +2 −2
  134. drivers/ipack/devices/ipoctal.c +3 −3
  135. drivers/irqchip/irq-mips-gic.c +1 −1
  136. drivers/irqchip/irq-renesas-intc-irqpin.c +1 −1
  137. drivers/media/common/videobuf2/videobuf2-vmalloc.c +1 −1
  138. drivers/media/pci/cx18/cx18-driver.c +1 −1
  139. drivers/media/pci/ivtv/ivtv-driver.c +3 −3
  140. drivers/media/platform/davinci/dm355_ccdc.c +1 −1
  141. drivers/media/platform/davinci/dm644x_ccdc.c +1 −1
  142. drivers/media/platform/davinci/isif.c +1 −1
  143. drivers/media/platform/tegra-cec/tegra_cec.c +1 −1
  144. drivers/misc/cardreader/rtsx_pcr.c +1 −1
  145. drivers/misc/mic/scif/scif_nodeqp.c +1 −1
  146. drivers/misc/pti.c +1 −1
  147. drivers/mmc/host/sdhci-acpi.c +1 −1
  148. drivers/mmc/host/via-sdmmc.c +1 −1
  149. drivers/mtd/devices/bcm47xxsflash.c +1 −1
  150. drivers/mtd/maps/amd76xrom.c +1 −1
  151. drivers/mtd/maps/ck804xrom.c +1 −1
  152. drivers/mtd/maps/esb2rom.c +1 −1
  153. drivers/mtd/maps/ichxrom.c +1 −1
  154. drivers/mtd/maps/intel_vr_nor.c +2 −2
  155. drivers/mtd/maps/l440gx.c +1 −1
  156. drivers/mtd/maps/netsc520.c +2 −2
  157. drivers/mtd/maps/nettel.c +4 −4
  158. drivers/mtd/maps/pci.c +2 −2
  159. drivers/mtd/maps/sc520cdp.c +4 −4
  160. drivers/mtd/maps/scb2_flash.c +1 −1
  161. drivers/mtd/maps/ts5500_flash.c +2 −2
  162. drivers/mtd/nand/raw/au1550nd.c +1 −1
  163. drivers/mtd/nand/raw/denali_pci.c +3 −3
  164. drivers/mtd/nand/raw/fsl_upm.c +1 −1
  165. drivers/net/can/at91_can.c +1 −1
  166. drivers/net/can/cc770/cc770_isa.c +1 −1
  167. drivers/net/can/sja1000/sja1000_isa.c +1 −1
  168. drivers/net/can/sja1000/sja1000_platform.c +1 −1
  169. drivers/net/can/softing/softing_main.c +1 −1
  170. drivers/net/ethernet/alacritech/slicoss.c +1 −1
  171. drivers/net/ethernet/altera/altera_tse_main.c +2 −2
  172. drivers/net/ethernet/amd/au1000_eth.c +3 −3
  173. drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +1 −1
  174. drivers/net/ethernet/atheros/ag71xx.c +1 −2
  175. drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 −1
  176. drivers/net/ethernet/broadcom/sb1250-mac.c +1 −1
  177. drivers/net/ethernet/brocade/bna/bnad.c +1 −1
  178. drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +1 −1
  179. drivers/net/ethernet/dec/tulip/de2104x.c +1 −1
  180. drivers/net/ethernet/ethoc.c +2 −2
  181. drivers/net/ethernet/i825xx/sni_82596.c +3 −3
  182. drivers/net/ethernet/korina.c +3 −3
  183. drivers/net/ethernet/lantiq_etop.c +1 −1
  184. drivers/net/ethernet/marvell/skge.c +1 −1
  185. drivers/net/ethernet/marvell/sky2.c +1 −1
  186. drivers/net/ethernet/natsemi/ns83820.c +1 −1
  187. drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c +4 −4
  188. drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c +3 −3
  189. drivers/net/ethernet/sfc/ef10.c +1 −1
  190. drivers/net/ethernet/sfc/efx.c +1 −1
  191. drivers/net/ethernet/sfc/falcon/efx.c +1 −1
  192. drivers/net/ethernet/smsc/smsc911x.c +1 −1
  193. drivers/net/ethernet/ti/netcp_core.c +1 −1
  194. drivers/net/ethernet/xilinx/ll_temac_main.c +2 −2
  195. drivers/net/fddi/defxx.c +1 −1
  196. drivers/net/fddi/defza.c +1 −1
  197. drivers/net/fjes/fjes_hw.c +1 −1
  198. drivers/net/wan/wanxl.c +2 −2
  199. drivers/net/wireless/ath/ath10k/ahb.c +2 −2
  200. drivers/net/wireless/ath/ath5k/ahb.c +1 −1
  201. drivers/net/wireless/ath/ath9k/ahb.c +1 −1
  202. drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2 −2
  203. drivers/net/wireless/intel/ipw2x00/ipw2100.c +1 −1
  204. drivers/opp/ti-opp-supply.c +1 −1
  205. drivers/parisc/ccio-dma.c +1 −1
  206. drivers/parisc/dino.c +1 −1
  207. drivers/parisc/eisa.c +2 −2
  208. drivers/parisc/iosapic.c +1 −1
  209. drivers/parisc/lba_pci.c +4 −4
  210. drivers/parisc/sba_iommu.c +2 −2
  211. drivers/pci/controller/dwc/pci-dra7xx.c +1 −1
  212. drivers/pci/controller/dwc/pcie-designware-ep.c +1 −1
  213. drivers/pci/msi.c +1 −1
  214. drivers/pci/pci.c +1 −1
  215. drivers/pci/quirks.c +2 −2
  216. drivers/pinctrl/bcm/pinctrl-ns2-mux.c +1 −1
  217. drivers/pinctrl/bcm/pinctrl-nsp-mux.c +1 −1
  218. drivers/pinctrl/freescale/pinctrl-imx1-core.c +1 −1
  219. drivers/pinctrl/pinctrl-amd.c +1 −1
  220. drivers/platform/x86/intel_scu_ipc.c +1 −1
  221. drivers/platform/x86/intel_telemetry_pltdrv.c +2 −2
  222. drivers/platform/x86/pmc_atom.c +1 −1
  223. drivers/platform/x86/samsung-laptop.c +2 −2
  224. drivers/regulator/ti-abb-regulator.c +2 −2
  225. drivers/rtc/rtc-sh.c +1 −1
  226. drivers/scsi/aic7xxx/aic79xx_osm_pci.c +1 −1
  227. drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +1 −1
  228. drivers/scsi/arcmsr/arcmsr_hba.c +1 −1
  229. drivers/scsi/be2iscsi/be_main.c +3 −3
  230. drivers/scsi/bnx2fc/bnx2fc_hwi.c +1 −1
  231. drivers/scsi/bnx2i/bnx2i_hwi.c +2 −2
  232. drivers/scsi/csiostor/csio_init.c +1 −1
  233. drivers/scsi/hpsa.c +1 −1
  234. drivers/scsi/lasi700.c +1 −1
  235. drivers/scsi/megaraid/megaraid_mbox.c +1 −1
  236. drivers/scsi/megaraid/megaraid_sas_base.c +1 −1
  237. drivers/scsi/myrb.c +1 −1
  238. drivers/scsi/myrs.c +1 −1
  239. drivers/scsi/pcmcia/nsp_cs.c +1 −1
  240. drivers/scsi/qla2xxx/qla_mr.c +2 −2
  241. drivers/scsi/smartpqi/smartpqi_init.c +1 −1
  242. drivers/scsi/sni_53c710.c +1 −1
  243. drivers/scsi/sun3x_esp.c +2 −2
  244. drivers/scsi/zalon.c +1 −1
  245. drivers/scsi/zorro_esp.c +3 −3
  246. drivers/sh/clk/core.c +1 −1
  247. drivers/sh/intc/core.c +1 −1
  248. drivers/sh/intc/userimask.c +1 −1
  249. drivers/soc/tegra/flowctrl.c +1 −1
  250. drivers/soc/tegra/fuse/fuse-tegra.c +1 −1
  251. drivers/soc/tegra/fuse/tegra-apbmisc.c +2 −2
  252. drivers/soc/tegra/pmc.c +2 −2
  253. drivers/soc/xilinx/xlnx_vcu.c +2 −2
  254. drivers/spi/spi-dw-mid.c +1 −1
  255. drivers/spi/spi-jcore.c +1 −1
  256. drivers/spi/spi-npcm-fiu.c +1 −1
  257. drivers/ssb/driver_extif.c +1 −1
  258. drivers/ssb/driver_pcicore.c +3 −3
  259. drivers/staging/gasket/gasket_core.c +1 −1
  260. drivers/staging/kpc2000/kpc2000/core.c +2 −2
  261. drivers/staging/kpc2000/kpc2000_i2c.c +1 −1
  262. drivers/staging/kpc2000/kpc2000_spi.c +1 −1
  263. drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c +1 −1
  264. drivers/staging/media/allegro-dvt/allegro-core.c +2 −2
  265. drivers/staging/qlge/qlge_main.c +2 −2
  266. drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 −1
  267. drivers/staging/rts5208/rtsx.c +1 −1
  268. drivers/staging/sm750fb/sm750_hw.c +1 −1
  269. drivers/staging/uwb/whc-rc.c +3 −3
  270. drivers/tc/tc.c +1 −1
  271. drivers/tty/cyclades.c +5 −5
  272. drivers/tty/mips_ejtag_fdc.c +1 −1
  273. drivers/tty/moxa.c +2 −2
  274. drivers/tty/serial/8250/8250_gsc.c +1 −1
  275. drivers/tty/serial/8250/8250_omap.c +1 −1
  276. drivers/tty/serial/8250/8250_pci.c +3 −3
  277. drivers/tty/serial/8250/8250_port.c +1 −1
  278. drivers/tty/serial/dz.c +1 −1
  279. drivers/tty/serial/lantiq.c +1 −1
  280. drivers/tty/serial/meson_uart.c +1 −1
  281. drivers/tty/serial/mux.c +1 −1
  282. drivers/tty/serial/owl-uart.c +1 −1
  283. drivers/tty/serial/pic32_uart.c +1 −1
  284. drivers/tty/serial/rda-uart.c +1 −1
  285. drivers/tty/serial/sb1250-duart.c +2 −2
  286. drivers/tty/serial/sh-sci.c +1 −1
  287. drivers/tty/serial/zs.c +1 −1
  288. drivers/tty/synclink.c +2 −2
  289. drivers/tty/synclink_gt.c +1 −1
  290. drivers/tty/synclinkmp.c +4 −4
  291. drivers/usb/core/hcd-pci.c +1 −1
  292. drivers/usb/early/xhci-dbc.c +1 −1
  293. drivers/usb/gadget/udc/amd5536udc_pci.c +1 −1
  294. drivers/usb/gadget/udc/goku_udc.c +1 −1
  295. drivers/usb/gadget/udc/net2272.c +3 −3
  296. drivers/usb/gadget/udc/net2280.c +1 −1
  297. drivers/usb/host/ehci-pmcmsp.c +3 −3
  298. drivers/usb/host/pci-quirks.c +1 −1
  299. drivers/usb/isp1760/isp1760-if.c +2 −2
  300. drivers/usb/roles/intel-xhci-usb-role-switch.c +1 −1
  301. drivers/usb/typec/ucsi/ucsi_acpi.c +1 −1
  302. drivers/vfio/pci/vfio_pci_rdwr.c +1 −1
  303. drivers/vfio/platform/reset/vfio_platform_amdxgbe.c +2 −2
  304. drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c +1 −1
  305. drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c +1 −1
  306. drivers/vfio/platform/vfio_platform_common.c +2 −2
  307. drivers/video/fbdev/carminefb.c +2 −2
  308. drivers/video/fbdev/i810/i810_main.c +1 −1
  309. drivers/video/fbdev/intelfb/intelfbdrv.c +1 −1
  310. drivers/video/fbdev/kyro/fbdev.c +1 −1
  311. drivers/video/fbdev/matrox/matroxfb_base.c +1 −1
  312. drivers/video/fbdev/mbx/mbxfb.c +2 −2
  313. drivers/video/fbdev/mmp/hw/mmp_ctrl.c +1 −1
  314. drivers/video/fbdev/pm2fb.c +1 −1
  315. drivers/video/fbdev/pm3fb.c +2 −2
  316. drivers/video/fbdev/pmag-aa-fb.c +2 −2
  317. drivers/video/fbdev/pmag-ba-fb.c +2 −2
  318. drivers/video/fbdev/pmagb-b-fb.c +2 −2
  319. drivers/video/fbdev/pvr2fb.c +2 −2
  320. drivers/video/fbdev/pxa168fb.c +1 −1
  321. drivers/video/fbdev/s1d13xxxfb.c +2 −2
  322. drivers/video/fbdev/sh7760fb.c +1 −1
  323. drivers/video/fbdev/sh_mobile_lcdcfb.c +1 −1
  324. drivers/video/fbdev/sstfb.c +2 −2
  325. drivers/video/fbdev/stifb.c +2 −2
  326. drivers/video/fbdev/tdfxfb.c +1 −1
  327. drivers/video/fbdev/tgafb.c +1 −1
  328. drivers/video/fbdev/tridentfb.c +2 −2
  329. drivers/video/fbdev/valkyriefb.c +1 −1
  330. drivers/video/fbdev/vermilion/cr_pll.c +1 −1
  331. drivers/video/fbdev/vermilion/vermilion.c +2 −2
  332. drivers/video/fbdev/via/via-core.c +1 −1
  333. drivers/video/fbdev/w100fb.c +3 −3
  334. drivers/vme/boards/vme_vmivme7805.c +1 −1
  335. drivers/vme/bridges/vme_ca91cx42.c +2 −2
  336. drivers/vme/bridges/vme_tsi148.c +2 −2
  337. drivers/w1/masters/matrox_w1.c +1 −1
  338. drivers/watchdog/bcm63xx_wdt.c +1 −1
  339. drivers/watchdog/intel_scu_watchdog.c +1 −1
  340. drivers/watchdog/rc32434_wdt.c +2 −2
  341. include/asm-generic/io.h +0 −4
  342. include/asm-generic/iomap.h +2 −2
  343. include/linux/io.h +2 −4
  344. lib/devres.c +0 −20
  345. scripts/coccinelle/free/devm_free.cocci +0 −4
  346. scripts/coccinelle/free/iounmap.cocci +1 −1
  347. sound/drivers/ml403-ac97cr.c +1 −1
  348. sound/isa/msnd/msnd_pinnacle.c +1 −1
  349. sound/parisc/harmony.c +1 −1
  350. sound/pci/aw2/aw2-alsa.c +1 −1
  351. sound/pci/cs46xx/cs46xx_lib.c +1 −1
  352. sound/pci/echoaudio/echoaudio.c +1 −1
  353. sound/pci/nm256/nm256.c +3 −3
  354. sound/pci/rme32.c +1 −1
  355. sound/pci/rme96.c +1 −1
  356. sound/pci/rme9652/hdsp.c +1 −1
  357. sound/pci/rme9652/hdspm.c +1 −1
  358. sound/pci/rme9652/rme9652.c +1 −1
  359. sound/pci/sis7019.c +1 −1
  360. sound/pci/ymfpci/ymfpci_main.c +1 −1
  361. sound/soc/au1x/ac97c.c +1 −1
  362. sound/soc/au1x/i2sc.c +1 −1
  363. sound/soc/intel/atom/sst/sst_acpi.c +5 −5
  364. sound/soc/sh/fsi.c +1 −1
  365. sound/x86/intel_hdmi_audio.c +1 −1
  366. tools/testing/nvdimm/Kbuild +1 −2
  367. tools/testing/nvdimm/test/iomap.c +3 −9
  368. tools/testing/nvdimm/test/nfit_test.h +0 −2
Documentation/driver-api/driver-model/devres.rst+0−1
@@ -313,7 +313,6 @@ IOMAP · 312 unmodified lines
313 devm_ioport_map()313 devm_ioport_map()
314 devm_ioport_unmap()314 devm_ioport_unmap()
315 devm_ioremap()315 devm_ioremap()
316 devm_ioremap_nocache()
317 devm_ioremap_uc()316 devm_ioremap_uc()
318 devm_ioremap_wc()317 devm_ioremap_wc()
319 devm_ioremap_resource() : checks resource, requests memory region, ioremaps318 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: · 1057 unmodified lines
1058 return err;1058 return err;
1059 }1059 }
1060 chip->iobase_phys = pci_resource_start(pci, 0);1060 chip->iobase_phys = pci_resource_start(pci, 0);
1061 chip->iobase_virt = ioremap_nocache(chip->iobase_phys,1061 chip->iobase_virt = ioremap(chip->iobase_phys,
1062 pci_resource_len(pci, 0));1062 pci_resource_len(pci, 0));
1063 1063
1064and the corresponding destructor would be:1064and the corresponding destructor would be:
Documentation/x86/pat.rst+0−2
@@ -44,8 +44,6 @@ address range to avoid any aliasing. · 43 unmodified lines
44+------------------------+----------+--------------+------------------+44+------------------------+----------+--------------+------------------+
45| ioremap_uc | -- | UC | UC |45| ioremap_uc | -- | UC | UC |
46+------------------------+----------+--------------+------------------+46+------------------------+----------+--------------+------------------+
47| ioremap_nocache | -- | UC- | UC- |
48+------------------------+----------+--------------+------------------+
49| ioremap_wc | -- | -- | WC |47| ioremap_wc | -- | -- | WC |
50+------------------------+----------+--------------+------------------+48+------------------------+----------+--------------+------------------+
51| ioremap_wt | -- | -- | WT |49| 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) · 282 unmodified lines
283 return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);283 return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);
284}284}
285 285
286static inline void __iomem * ioremap_nocache(unsigned long offset,286#define ioremap_wc ioremap
287 unsigned long size)287#define ioremap_uc ioremap
288{
289 return ioremap(offset, size);
290}
291
292#define ioremap_wc ioremap_nocache
293#define ioremap_uc ioremap_nocache
294 288
295static inline void iounmap(volatile void __iomem *addr)289static inline void iounmap(volatile void __iomem *addr)
296{290{
arch/arm/include/asm/io.h+0−8
@@ -356,7 +356,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from, · 355 unmodified lines
356 *356 *
357 * Function Memory type Cacheability Cache hint357 * Function Memory type Cacheability Cache hint
358 * ioremap() Device n/a n/a358 * ioremap() Device n/a n/a
359 * ioremap_nocache() Device n/a n/a
360 * ioremap_cache() Normal Writeback Read allocate359 * ioremap_cache() Normal Writeback Read allocate
361 * ioremap_wc() Normal Non-cacheable n/a360 * ioremap_wc() Normal Non-cacheable n/a
362 * ioremap_wt() Normal Non-cacheable n/a361 * ioremap_wt() Normal Non-cacheable n/a
@@ -368,13 +367,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from, · 5 unmodified lines
368 * - unaligned accesses are "unpredictable"367 * - unaligned accesses are "unpredictable"
369 * - writes may be delayed before they hit the endpoint device368 * - writes may be delayed before they hit the endpoint device
370 *369 *
371 * ioremap_nocache() is the same as ioremap() as there are too many device
372 * drivers using this for device registers, and documentation which tells
373 * people to use it for such for this to be any different. This is not a
374 * safe fallback for memory-like mappings, or memory regions where the
375 * compiler may generate unaligned accesses - eg, via inlining its own
376 * memcpy.
377 *
378 * All normal memory mappings have the following properties:370 * All normal memory mappings have the following properties:
379 * - reads can be repeated with no side effects371 * - reads can be repeated with no side effects
380 * - repeated reads return the last value written372 * - 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) · 104 unmodified lines
105 if (!secondary_boot_addr)105 if (!secondary_boot_addr)
106 return -EINVAL;106 return -EINVAL;
107 107
108 sku_rom_lut = ioremap_nocache((phys_addr_t)secondary_boot_addr,108 sku_rom_lut = ioremap((phys_addr_t)secondary_boot_addr,
109 sizeof(phys_addr_t));109 sizeof(phys_addr_t));
110 if (!sku_rom_lut) {110 if (!sku_rom_lut) {
111 pr_warn("unable to ioremap SKU-ROM LUT register for cpu %u\n", cpu);111 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) · 62 unmodified lines
174 if (!secondary_boot_addr)174 if (!secondary_boot_addr)
175 return -EINVAL;175 return -EINVAL;
176 176
177 boot_reg = ioremap_nocache((phys_addr_t)secondary_boot_addr,177 boot_reg = ioremap((phys_addr_t)secondary_boot_addr,
178 sizeof(phys_addr_t));178 sizeof(phys_addr_t));
179 if (!boot_reg) {179 if (!boot_reg) {
180 pr_err("unable to map boot register for cpu %u\n", cpu_id);180 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; · 33 unmodified lines
34 34
35void davinci_map_sysmod(void)35void davinci_map_sysmod(void)
36{36{
37 davinci_sysmod_base = ioremap_nocache(DAVINCI_SYSTEM_MODULE_BASE,37 davinci_sysmod_base = ioremap(DAVINCI_SYSTEM_MODULE_BASE,
38 0x800);38 0x800);
39 /*39 /*
40 * Throw a bug since a lot of board initialization code depends40 * 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) · 1007 unmodified lines
1008 pxa_set_udc_info(&magician_udc_info);1008 pxa_set_udc_info(&magician_udc_info);
1009 1009
1010 /* Check LCD type we have */1010 /* Check LCD type we have */
1011 cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);1011 cpld = ioremap(PXA_CS3_PHYS, 0x1000);
1012 if (cpld) {1012 if (cpld) {
1013 u8 board_id = __raw_readb(cpld + 0x14);1013 u8 board_id = __raw_readb(cpld + 0x14);
1014 1014
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) · 188 unmodified lines
189 if ((cpu >= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)189 if ((cpu >= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)
190 return;190 return;
191 191
192 apmu_cpus[cpu].iomem = ioremap_nocache(res->start, resource_size(res));192 apmu_cpus[cpu].iomem = ioremap(res->start, resource_size(res));
193 apmu_cpus[cpu].bit = bit;193 apmu_cpus[cpu].bit = bit;
194 194
195 pr_debug("apmu ioremap %d %d %pr\n", cpu, bit, res);195 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 @@ map: · 102 unmodified lines
103 iounmap(p);103 iounmap(p);
104 104
105 /* setup reset vectors */105 /* setup reset vectors */
106 p = ioremap_nocache(RST, 0x63);106 p = ioremap(RST, 0x63);
107 bar = phys_to_sbar(res.start);107 bar = phys_to_sbar(res.start);
108 if (has_a15) {108 if (has_a15) {
109 writel_relaxed(bar, p + CA15BAR);109 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) · 27 unmodified lines
28{28{
29 void __iomem *reg;29 void __iomem *reg;
30 30
31 reg = ioremap_nocache(MEBUFCNTR, 4);31 reg = ioremap(MEBUFCNTR, 4);
32 if (reg) {32 if (reg) {
33 iowrite32(0x01600164, reg);33 iowrite32(0x01600164, reg);
34 iounmap(reg);34 iounmap(reg);
@@ -37,9 +37,9 @@ static void __init r8a7740_meram_workaround(void) · 2 unmodified lines
37 37
38static void __init r8a7740_init_irq_of(void)38static void __init r8a7740_init_irq_of(void)
39{39{
40 void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);40 void __iomem *intc_prio_base = ioremap(0xe6900010, 0x10);
41 void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);41 void __iomem *intc_msk_base = ioremap(0xe6900040, 0x10);
42 void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);42 void __iomem *pfc_inta_ctrl = ioremap(0xe605807c, 0x4);
43 43
44 irqchip_init();44 irqchip_init();
45 45
arch/arm/mach-shmobile/setup-r8a7778.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
22 22
23static void __init r8a7778_init_irq_dt(void)23static void __init r8a7778_init_irq_dt(void)
24{24{
25 void __iomem *base = ioremap_nocache(0xfe700000, 0x00100000);25 void __iomem *base = ioremap(0xfe700000, 0x00100000);
26 26
27 BUG_ON(!base);27 BUG_ON(!base);
28 28
arch/hexagon/include/asm/io.h+0−1
@@ -172,7 +172,6 @@ static inline void writel(u32 data, volatile void __iomem *addr) · 171 unmodified lines
172#define writel_relaxed __raw_writel172#define writel_relaxed __raw_writel
173 173
174void __iomem *ioremap(unsigned long phys_addr, unsigned long size);174void __iomem *ioremap(unsigned long phys_addr, unsigned long size);
175#define ioremap_nocache ioremap
176#define ioremap_uc(X, Y) ioremap((X), (Y))175#define ioremap_uc(X, Y) ioremap((X), (Y))
177 176
178 177
arch/ia64/include/asm/vga.h+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18extern unsigned long vga_console_iobase;18extern unsigned long vga_console_iobase;
19extern unsigned long vga_console_membase;19extern unsigned long vga_console_membase;
20 20
21#define VGA_MAP_MEM(x,s) ((unsigned long) ioremap_nocache(vga_console_membase + (x), s))21#define VGA_MAP_MEM(x,s) ((unsigned long) ioremap(vga_console_membase + (x), s))
22 22
23#define vga_readb(x) (*(x))23#define vga_readb(x) (*(x))
24#define vga_writeb(x,y) (*(y) = (x))24#define vga_writeb(x,y) (*(y) = (x))
arch/ia64/kernel/cyclone.c+4−4
@@ -50,7 +50,7 @@ int __init init_cyclone_clock(void) · 49 unmodified lines
50 50
51 /* find base address */51 /* find base address */
52 offset = (CYCLONE_CBAR_ADDR);52 offset = (CYCLONE_CBAR_ADDR);
53 reg = ioremap_nocache(offset, sizeof(u64));53 reg = ioremap(offset, sizeof(u64));
54 if(!reg){54 if(!reg){
55 printk(KERN_ERR "Summit chipset: Could not find valid CBAR"55 printk(KERN_ERR "Summit chipset: Could not find valid CBAR"
56 " register.\n");56 " register.\n");
@@ -68,7 +68,7 @@ int __init init_cyclone_clock(void) · 11 unmodified lines
68 68
69 /* setup PMCC */69 /* setup PMCC */
70 offset = (base + CYCLONE_PMCC_OFFSET);70 offset = (base + CYCLONE_PMCC_OFFSET);
71 reg = ioremap_nocache(offset, sizeof(u64));71 reg = ioremap(offset, sizeof(u64));
72 if(!reg){72 if(!reg){
73 printk(KERN_ERR "Summit chipset: Could not find valid PMCC"73 printk(KERN_ERR "Summit chipset: Could not find valid PMCC"
74 " register.\n");74 " register.\n");
@@ -80,7 +80,7 @@ int __init init_cyclone_clock(void) · 5 unmodified lines
80 80
81 /* setup MPCS */81 /* setup MPCS */
82 offset = (base + CYCLONE_MPCS_OFFSET);82 offset = (base + CYCLONE_MPCS_OFFSET);
83 reg = ioremap_nocache(offset, sizeof(u64));83 reg = ioremap(offset, sizeof(u64));
84 if(!reg){84 if(!reg){
85 printk(KERN_ERR "Summit chipset: Could not find valid MPCS"85 printk(KERN_ERR "Summit chipset: Could not find valid MPCS"
86 " register.\n");86 " register.\n");
@@ -92,7 +92,7 @@ int __init init_cyclone_clock(void) · 5 unmodified lines
92 92
93 /* map in cyclone_timer */93 /* map in cyclone_timer */
94 offset = (base + CYCLONE_MPMC_OFFSET);94 offset = (base + CYCLONE_MPMC_OFFSET);
95 cyclone_timer = ioremap_nocache(offset, sizeof(u32));95 cyclone_timer = ioremap(offset, sizeof(u32));
96 if(!cyclone_timer){96 if(!cyclone_timer){
97 printk(KERN_ERR "Summit chipset: Could not find valid MPMC"97 printk(KERN_ERR "Summit chipset: Could not find valid MPMC"
98 " register.\n");98 " 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) · 26 unmodified lines
27 return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);27 return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
28}28}
29 29
30#define ioremap_nocache ioremap
31#define ioremap_uc ioremap30#define ioremap_uc ioremap
32#define ioremap_wt ioremap_wt31#define ioremap_wt ioremap_wt
33static inline void __iomem *ioremap_wt(unsigned long physaddr,32static 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, · 235 unmodified lines
236 236
237static void __init tnetd7300_init_clocks(void)237static void __init tnetd7300_init_clocks(void)
238{238{
239 u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);239 u32 *bootcr = (u32 *)ioremap(AR7_REGS_DCL, 4);
240 struct tnetd7300_clocks *clocks =240 struct tnetd7300_clocks *clocks =
241 ioremap_nocache(UR8_REGS_CLOCKS,241 ioremap(UR8_REGS_CLOCKS,
242 sizeof(struct tnetd7300_clocks));242 sizeof(struct tnetd7300_clocks));
243 243
244 bus_clk.rate = tnetd7300_get_clock(BUS_PLL_SOURCE_SHIFT,244 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) · 75 unmodified lines
320 320
321static void __init tnetd7200_init_clocks(void)321static void __init tnetd7200_init_clocks(void)
322{322{
323 u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);323 u32 *bootcr = (u32 *)ioremap(AR7_REGS_DCL, 4);
324 struct tnetd7200_clocks *clocks =324 struct tnetd7200_clocks *clocks =
325 ioremap_nocache(AR7_REGS_CLOCKS,325 ioremap(AR7_REGS_CLOCKS,
326 sizeof(struct tnetd7200_clocks));326 sizeof(struct tnetd7200_clocks));
327 int cpu_base, cpu_mul, cpu_prediv, cpu_postdiv;327 int cpu_base, cpu_mul, cpu_prediv, cpu_postdiv;
328 int dsp_base, dsp_mul, dsp_prediv, dsp_postdiv;328 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) · 307 unmodified lines
308 size = 0x1f;308 size = 0x1f;
309 }309 }
310 310
311 gpch->regs = ioremap_nocache(AR7_REGS_GPIO, size);311 gpch->regs = ioremap(AR7_REGS_GPIO, size);
312 if (!gpch->regs) {312 if (!gpch->regs) {
313 printk(KERN_ERR "%s: failed to ioremap regs\n",313 printk(KERN_ERR "%s: failed to ioremap regs\n",
314 gpch->chip.label);314 gpch->chip.label);
arch/mips/ar7/platform.c+1−1
@@ -702,7 +702,7 @@ static int __init ar7_register_devices(void) · 701 unmodified lines
702 pr_warn("unable to register usb slave: %d\n", res);702 pr_warn("unable to register usb slave: %d\n", res);
703 703
704 /* Register watchdog only if enabled in hardware */704 /* Register watchdog only if enabled in hardware */
705 bootcr = ioremap_nocache(AR7_REGS_DCL, 4);705 bootcr = ioremap(AR7_REGS_DCL, 4);
706 val = readl(bootcr);706 val = readl(bootcr);
707 iounmap(bootcr);707 iounmap(bootcr);
708 if (val & AR7_WDT_HW_ENA) {708 if (val & AR7_WDT_HW_ENA) {
arch/mips/ath25/ar2315.c+2−2
@@ -262,7 +262,7 @@ void __init ar2315_plat_mem_setup(void) · 261 unmodified lines
262 u32 config;262 u32 config;
263 263
264 /* Detect memory size */264 /* Detect memory size */
265 sdram_base = ioremap_nocache(AR2315_SDRAMCTL_BASE,265 sdram_base = ioremap(AR2315_SDRAMCTL_BASE,
266 AR2315_SDRAMCTL_SIZE);266 AR2315_SDRAMCTL_SIZE);
267 memcfg = __raw_readl(sdram_base + AR2315_MEM_CFG);267 memcfg = __raw_readl(sdram_base + AR2315_MEM_CFG);
268 memsize = 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_DATA_WIDTH);268 memsize = 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_DATA_WIDTH);
@@ -272,7 +272,7 @@ void __init ar2315_plat_mem_setup(void) · 3 unmodified lines
272 add_memory_region(0, memsize, BOOT_MEM_RAM);272 add_memory_region(0, memsize, BOOT_MEM_RAM);
273 iounmap(sdram_base);273 iounmap(sdram_base);
274 274
275 ar2315_rst_base = ioremap_nocache(AR2315_RST_BASE, AR2315_RST_SIZE);275 ar2315_rst_base = ioremap(AR2315_RST_BASE, AR2315_RST_SIZE);
276 276
277 /* Detect the hardware based on the device ID */277 /* Detect the hardware based on the device ID */
278 devid = ar2315_rst_reg_read(AR2315_SREV) & AR2315_REV_CHIP;278 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) · 184 unmodified lines
185 void __iomem *flashctl_base;185 void __iomem *flashctl_base;
186 u32 ctl;186 u32 ctl;
187 187
188 flashctl_base = ioremap_nocache(AR5312_FLASHCTL_BASE,188 flashctl_base = ioremap(AR5312_FLASHCTL_BASE,
189 AR5312_FLASHCTL_SIZE);189 AR5312_FLASHCTL_SIZE);
190 190
191 ctl = __raw_readl(flashctl_base + AR5312_FLASHCTL0);191 ctl = __raw_readl(flashctl_base + AR5312_FLASHCTL0);
@@ -358,7 +358,7 @@ void __init ar5312_plat_mem_setup(void) · 166 unmodified lines
358 u32 devid;358 u32 devid;
359 359
360 /* Detect memory size */360 /* Detect memory size */
361 sdram_base = ioremap_nocache(AR5312_SDRAMCTL_BASE,361 sdram_base = ioremap(AR5312_SDRAMCTL_BASE,
362 AR5312_SDRAMCTL_SIZE);362 AR5312_SDRAMCTL_SIZE);
363 memcfg = __raw_readl(sdram_base + AR5312_MEM_CFG1);363 memcfg = __raw_readl(sdram_base + AR5312_MEM_CFG1);
364 bank0_ac = ATH25_REG_MS(memcfg, AR5312_MEM_CFG1_AC0);364 bank0_ac = ATH25_REG_MS(memcfg, AR5312_MEM_CFG1_AC0);
@@ -369,7 +369,7 @@ void __init ar5312_plat_mem_setup(void) · 4 unmodified lines
369 add_memory_region(0, memsize, BOOT_MEM_RAM);369 add_memory_region(0, memsize, BOOT_MEM_RAM);
370 iounmap(sdram_base);370 iounmap(sdram_base);
371 371
372 ar5312_rst_base = ioremap_nocache(AR5312_RST_BASE, AR5312_RST_SIZE);372 ar5312_rst_base = ioremap(AR5312_RST_BASE, AR5312_RST_SIZE);
373 373
374 devid = ar5312_rst_reg_read(AR5312_REV);374 devid = ar5312_rst_reg_read(AR5312_REV);
375 devid >>= AR5312_REV_WMAC_MIN_S;375 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) · 110 unmodified lines
111 u8 *mac_addr;111 u8 *mac_addr;
112 u32 offset;112 u32 offset;
113 113
114 flash_base = ioremap_nocache(base, size);114 flash_base = ioremap(base, size);
115 flash_limit = flash_base + size;115 flash_limit = flash_base + size;
116 116
117 ath25_board.config = NULL;117 ath25_board.config = NULL;
arch/mips/ath79/common.c+1−1
@@ -41,7 +41,7 @@ static void __iomem *ath79_ddr_pci_win_base; · 40 unmodified lines
41 41
42void ath79_ddr_ctrl_init(void)42void ath79_ddr_ctrl_init(void)
43{43{
44 ath79_ddr_base = ioremap_nocache(AR71XX_DDR_CTRL_BASE,44 ath79_ddr_base = ioremap(AR71XX_DDR_CTRL_BASE,
45 AR71XX_DDR_CTRL_SIZE);45 AR71XX_DDR_CTRL_SIZE);
46 if (soc_is_ar913x() || soc_is_ar724x() || soc_is_ar933x()) {46 if (soc_is_ar913x() || soc_is_ar724x() || soc_is_ar933x()) {
47 ath79_ddr_wb_flush_base = ath79_ddr_base + 0x7c;47 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) · 225 unmodified lines
226 else if (fw_passed_dtb)226 else if (fw_passed_dtb)
227 __dt_setup_arch((void *)KSEG0ADDR(fw_passed_dtb));227 __dt_setup_arch((void *)KSEG0ADDR(fw_passed_dtb));
228 228
229 ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,229 ath79_reset_base = ioremap(AR71XX_RESET_BASE,
230 AR71XX_RESET_SIZE);230 AR71XX_RESET_SIZE);
231 ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,231 ath79_pll_base = ioremap(AR71XX_PLL_BASE,
232 AR71XX_PLL_SIZE);232 AR71XX_PLL_SIZE);
233 ath79_detect_sys_type();233 ath79_detect_sys_type();
234 ath79_ddr_ctrl_init();234 ath79_ddr_ctrl_init();
arch/mips/cavium-octeon/setup.c+1−1
@@ -357,7 +357,7 @@ static void octeon_write_lcd(const char *s) · 356 unmodified lines
357{357{
358 if (octeon_bootinfo->led_display_base_addr) {358 if (octeon_bootinfo->led_display_base_addr) {
359 void __iomem *lcd_address =359 void __iomem *lcd_address =
360 ioremap_nocache(octeon_bootinfo->led_display_base_addr,360 ioremap(octeon_bootinfo->led_display_base_addr,
361 8);361 8);
362 int i;362 int i;
363 for (i = 0; i < 8; i++, s++) {363 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) · 50 unmodified lines
51{51{
52 void __iomem *uart_base;52 void __iomem *uart_base;
53 53
54 uart_base = ioremap_nocache(UART_UART, 0x20);54 uart_base = ioremap(UART_UART, 0x20);
55 setup_8250_early_printk_port((unsigned long)uart_base, 2, 50000);55 setup_8250_early_printk_port((unsigned long)uart_base, 2, 50000);
56}56}
57 57
arch/mips/include/asm/io.h+0−1
@@ -227,7 +227,6 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, · 226 unmodified lines
227 */227 */
228#define ioremap(offset, size) \228#define ioremap(offset, size) \
229 __ioremap_mode((offset), (size), _CACHE_UNCACHED)229 __ioremap_mode((offset), (size), _CACHE_UNCACHED)
230#define ioremap_nocache ioremap
231#define ioremap_uc ioremap230#define ioremap_uc ioremap
232 231
233/*232/*
arch/mips/kernel/mips-cm.c+2−2
@@ -194,7 +194,7 @@ static void mips_cm_probe_l2sync(void) · 193 unmodified lines
194 write_gcr_l2_only_sync_base(addr | CM_GCR_L2_ONLY_SYNC_BASE_SYNCEN);194 write_gcr_l2_only_sync_base(addr | CM_GCR_L2_ONLY_SYNC_BASE_SYNCEN);
195 195
196 /* Map the region */196 /* Map the region */
197 mips_cm_l2sync_base = ioremap_nocache(addr, MIPS_CM_L2SYNC_SIZE);197 mips_cm_l2sync_base = ioremap(addr, MIPS_CM_L2SYNC_SIZE);
198}198}
199 199
200int mips_cm_probe(void)200int mips_cm_probe(void)
@@ -215,7 +215,7 @@ int mips_cm_probe(void) · 14 unmodified lines
215 if (!addr)215 if (!addr)
216 return -ENODEV;216 return -ENODEV;
217 217
218 mips_gcr_base = ioremap_nocache(addr, MIPS_CM_GCR_SIZE);218 mips_gcr_base = ioremap(addr, MIPS_CM_GCR_SIZE);
219 if (!mips_gcr_base)219 if (!mips_gcr_base)
220 return -ENXIO;220 return -ENXIO;
221 221
arch/mips/kernel/mips-cpc.c+1−1
@@ -78,7 +78,7 @@ int mips_cpc_probe(void) · 77 unmodified lines
78 if (!addr)78 if (!addr)
79 return -ENODEV;79 return -ENODEV;
80 80
81 mips_cpc_base = ioremap_nocache(addr, 0x8000);81 mips_cpc_base = ioremap(addr, 0x8000);
82 if (!mips_cpc_base)82 if (!mips_cpc_base)
83 return -ENXIO;83 return -ENXIO;
84 84
arch/mips/lantiq/falcon/sysctrl.c+3−3
@@ -221,16 +221,16 @@ void __init ltq_soc_init(void) · 220 unmodified lines
221 res_sys[2].name) < 0))221 res_sys[2].name) < 0))
222 pr_err("Failed to request core resources");222 pr_err("Failed to request core resources");
223 223
224 status_membase = ioremap_nocache(res_status.start,224 status_membase = ioremap(res_status.start,
225 resource_size(&res_status));225 resource_size(&res_status));
226 ltq_ebu_membase = ioremap_nocache(res_ebu.start,226 ltq_ebu_membase = ioremap(res_ebu.start,
227 resource_size(&res_ebu));227 resource_size(&res_ebu));
228 228
229 if (!status_membase || !ltq_ebu_membase)229 if (!status_membase || !ltq_ebu_membase)
230 panic("Failed to remap core resources");230 panic("Failed to remap core resources");
231 231
232 for (i = 0; i < 3; i++) {232 for (i = 0; i < 3; i++) {
233 sysctl_membase[i] = ioremap_nocache(res_sys[i].start,233 sysctl_membase[i] = ioremap(res_sys[i].start,
234 resource_size(&res_sys[i]));234 resource_size(&res_sys[i]));
235 if (!sysctl_membase[i])235 if (!sysctl_membase[i])
236 panic("Failed to remap sysctrl resources");236 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) · 348 unmodified lines
349 res.name))349 res.name))
350 pr_err("Failed to request icu%i memory\n", vpe);350 pr_err("Failed to request icu%i memory\n", vpe);
351 351
352 ltq_icu_membase[vpe] = ioremap_nocache(res.start,352 ltq_icu_membase[vpe] = ioremap(res.start,
353 resource_size(&res));353 resource_size(&res));
354 354
355 if (!ltq_icu_membase[vpe])355 if (!ltq_icu_membase[vpe])
@@ -402,7 +402,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) · 46 unmodified lines
402 res.name))402 res.name))
403 pr_err("Failed to request eiu memory");403 pr_err("Failed to request eiu memory");
404 404
405 ltq_eiu_membase = ioremap_nocache(res.start,405 ltq_eiu_membase = ioremap(res.start,
406 resource_size(&res));406 resource_size(&res));
407 if (!ltq_eiu_membase)407 if (!ltq_eiu_membase)
408 panic("Failed to remap eiu memory");408 panic("Failed to remap eiu memory");
arch/mips/lantiq/xway/sysctrl.c+3−3
@@ -431,10 +431,10 @@ void __init ltq_soc_init(void) · 430 unmodified lines
431 res_ebu.name))431 res_ebu.name))
432 pr_err("Failed to request core resources");432 pr_err("Failed to request core resources");
433 433
434 pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu));434 pmu_membase = ioremap(res_pmu.start, resource_size(&res_pmu));
435 ltq_cgu_membase = ioremap_nocache(res_cgu.start,435 ltq_cgu_membase = ioremap(res_cgu.start,
436 resource_size(&res_cgu));436 resource_size(&res_cgu));
437 ltq_ebu_membase = ioremap_nocache(res_ebu.start,437 ltq_ebu_membase = ioremap(res_ebu.start,
438 resource_size(&res_ebu));438 resource_size(&res_ebu));
439 if (!pmu_membase || !ltq_cgu_membase || !ltq_ebu_membase)439 if (!pmu_membase || !ltq_cgu_membase || !ltq_ebu_membase)
440 panic("Failed to remap core resources");440 panic("Failed to remap core resources");
arch/mips/loongson2ef/common/reset.c+2−2
@@ -17,11 +17,11 @@ · 16 unmodified lines
17static inline void loongson_reboot(void)17static inline void loongson_reboot(void)
18{18{
19#ifndef CONFIG_CPU_JUMP_WORKAROUNDS19#ifndef CONFIG_CPU_JUMP_WORKAROUNDS
20 ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();20 ((void (*)(void))ioremap(LOONGSON_BOOT_BASE, 4)) ();
21#else21#else
22 void (*func)(void);22 void (*func)(void);
23 23
24 func = (void *)ioremap_nocache(LOONGSON_BOOT_BASE, 4);24 func = (void *)ioremap(LOONGSON_BOOT_BASE, 4);
25 25
26 __asm__ __volatile__(26 __asm__ __volatile__(
27 " .set noat \n"27 " .set noat \n"
arch/mips/loongson32/common/prom.c+4−4
@@ -26,13 +26,13 @@ void __init prom_init(void) · 25 unmodified lines
26 memsize = DEFAULT_MEMSIZE;26 memsize = DEFAULT_MEMSIZE;
27 27
28 if (strstr(arcs_cmdline, "console=ttyS3"))28 if (strstr(arcs_cmdline, "console=ttyS3"))
29 uart_base = ioremap_nocache(LS1X_UART3_BASE, 0x0f);29 uart_base = ioremap(LS1X_UART3_BASE, 0x0f);
30 else if (strstr(arcs_cmdline, "console=ttyS2"))30 else if (strstr(arcs_cmdline, "console=ttyS2"))
31 uart_base = ioremap_nocache(LS1X_UART2_BASE, 0x0f);31 uart_base = ioremap(LS1X_UART2_BASE, 0x0f);
32 else if (strstr(arcs_cmdline, "console=ttyS1"))32 else if (strstr(arcs_cmdline, "console=ttyS1"))
33 uart_base = ioremap_nocache(LS1X_UART1_BASE, 0x0f);33 uart_base = ioremap(LS1X_UART1_BASE, 0x0f);
34 else34 else
35 uart_base = ioremap_nocache(LS1X_UART0_BASE, 0x0f);35 uart_base = ioremap(LS1X_UART0_BASE, 0x0f);
36 setup_8250_early_printk_port((unsigned long)uart_base, 0, 0);36 setup_8250_early_printk_port((unsigned long)uart_base, 0, 0);
37}37}
38 38
arch/mips/loongson32/common/reset.c+1−1
@@ -37,7 +37,7 @@ static void ls1x_power_off(void) · 36 unmodified lines
37 37
38static int __init ls1x_reboot_setup(void)38static int __init ls1x_reboot_setup(void)
39{39{
40 wdt_reg_base = ioremap_nocache(LS1X_WDT_BASE, (SZ_4 + SZ_8));40 wdt_reg_base = ioremap(LS1X_WDT_BASE, (SZ_4 + SZ_8));
41 if (!wdt_reg_base)41 if (!wdt_reg_base)
42 panic("Failed to remap watchdog registers");42 panic("Failed to remap watchdog registers");
43 43
arch/mips/loongson32/common/time.c+1−1
@@ -49,7 +49,7 @@ static inline void ls1x_pwmtimer_restart(void) · 48 unmodified lines
49 49
50void __init ls1x_pwmtimer_init(void)50void __init ls1x_pwmtimer_init(void)
51{51{
52 timer_reg_base = ioremap_nocache(LS1X_TIMER_BASE, SZ_16);52 timer_reg_base = ioremap(LS1X_TIMER_BASE, SZ_16);
53 if (!timer_reg_base)53 if (!timer_reg_base)
54 panic("Failed to remap timer registers");54 panic("Failed to remap timer registers");
55 55
arch/mips/loongson64/reset.c+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
17 17
18static inline void loongson_reboot(void)18static inline void loongson_reboot(void)
19{19{
20 ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();20 ((void (*)(void))ioremap(LOONGSON_BOOT_BASE, 4)) ();
21}21}
22 22
23static void loongson_restart(char *command)23static 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) · 239 unmodified lines
240 * On systems using the RocIT system controller a GIC may be240 * On systems using the RocIT system controller a GIC may be
241 * present without a CM. Detect whether that is the case.241 * present without a CM. Detect whether that is the case.
242 */242 */
243 biu_base = ioremap_nocache(MSC01_BIU_REG_BASE,243 biu_base = ioremap(MSC01_BIU_REG_BASE,
244 MSC01_BIU_ADDRSPACE_SZ);244 MSC01_BIU_ADDRSPACE_SZ);
245 sc_cfg = __raw_readl(biu_base + MSC01_SC_CFG_OFS);245 sc_cfg = __raw_readl(biu_base + MSC01_SC_CFG_OFS);
246 if (sc_cfg & MSC01_SC_CFG_GICPRES_MSK) {246 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) · 408 unmodified lines
409 goto out6;409 goto out6;
410 }410 }
411 411
412 ctx->regs = ioremap_nocache(r->start, resource_size(r));412 ctx->regs = ioremap(r->start, resource_size(r));
413 if (!ctx->regs) {413 if (!ctx->regs) {
414 dev_err(&pdev->dev, "cannot map pci regs\n");414 dev_err(&pdev->dev, "cannot map pci regs\n");
415 ret = -ENODEV;415 ret = -ENODEV;
arch/mips/pci/pci-ar2315.c+1−1
@@ -441,7 +441,7 @@ static int ar2315_pci_probe(struct platform_device *pdev) · 440 unmodified lines
441 apc->mem_res.flags = IORESOURCE_MEM;441 apc->mem_res.flags = IORESOURCE_MEM;
442 442
443 /* Remap PCI config space */443 /* Remap PCI config space */
444 apc->cfg_mem = devm_ioremap_nocache(dev, res->start,444 apc->cfg_mem = devm_ioremap(dev, res->start,
445 AR2315_PCI_CFG_SIZE);445 AR2315_PCI_CFG_SIZE);
446 if (!apc->cfg_mem) {446 if (!apc->cfg_mem) {
447 dev_err(dev, "failed to remap PCI config space\n");447 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) · 220 unmodified lines
221 * a spinlock for each io access, so this is currently kind of221 * a spinlock for each io access, so this is currently kind of
222 * broken on SMP.222 * broken on SMP.
223 */223 */
224 pci_iospace_start = ioremap_nocache(BCM_PCI_IO_BASE_PA, 4);224 pci_iospace_start = ioremap(BCM_PCI_IO_BASE_PA, 4);
225 if (!pci_iospace_start)225 if (!pci_iospace_start)
226 return -ENOMEM;226 return -ENOMEM;
227 227
arch/mips/pci/pci-rt2880.c+1−1
@@ -218,7 +218,7 @@ static int rt288x_pci_probe(struct platform_device *pdev) · 217 unmodified lines
218{218{
219 void __iomem *io_map_base;219 void __iomem *io_map_base;
220 220
221 rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);221 rt2880_pci_base = ioremap(RT2880_PCI_BASE, PAGE_SIZE);
222 222
223 io_map_base = ioremap(RT2880_PCI_IO_BASE, RT2880_PCI_IO_SIZE);223 io_map_base = ioremap(RT2880_PCI_IO_BASE, RT2880_PCI_IO_SIZE);
224 rt2880_pci_controller.io_map_base = (unsigned long) io_map_base;224 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) · 134 unmodified lines
135 char *arch_cmdline = pic32_getcmdline();135 char *arch_cmdline = pic32_getcmdline();
136 int baud = -1;136 int baud = -1;
137 137
138 uart_base = ioremap_nocache(PIC32_BASE_UART, 0xc00);138 uart_base = ioremap(PIC32_BASE_UART, 0xc00);
139 139
140 baud = get_baud_from_cmdline(arch_cmdline);140 baud = get_baud_from_cmdline(arch_cmdline);
141 if (port == -1)141 if (port == -1)
arch/mips/pic32/pic32mzda/early_pin.c+2−2
@@ -122,7 +122,7 @@ static const struct · 121 unmodified lines
122 122
123void pic32_pps_input(int function, int pin)123void pic32_pps_input(int function, int pin)
124{124{
125 void __iomem *pps_base = ioremap_nocache(PPS_BASE, 0xF4);125 void __iomem *pps_base = ioremap(PPS_BASE, 0xF4);
126 int i;126 int i;
127 127
128 for (i = 0; i < ARRAY_SIZE(input_pin_reg); i++) {128 for (i = 0; i < ARRAY_SIZE(input_pin_reg); i++) {
@@ -252,7 +252,7 @@ static const struct · 123 unmodified lines
252 252
253void pic32_pps_output(int function, int pin)253void pic32_pps_output(int function, int pin)
254{254{
255 void __iomem *pps_base = ioremap_nocache(PPS_BASE, 0x170);255 void __iomem *pps_base = ioremap(PPS_BASE, 0x170);
256 int i;256 int i;
257 257
258 for (i = 0; i < ARRAY_SIZE(output_pin_reg); i++) {258 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) · 104 unmodified lines
105 105
106 /* Initialize first serial port */106 /* Initialize first serial port */
107 up.mapbase = MSP_UART0_BASE;107 up.mapbase = MSP_UART0_BASE;
108 up.membase = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);108 up.membase = ioremap(up.mapbase, MSP_UART_REG_LEN);
109 up.irq = MSP_INT_UART0;109 up.irq = MSP_INT_UART0;
110 up.uartclk = uartclk;110 up.uartclk = uartclk;
111 up.regshift = 2;111 up.regshift = 2;
@@ -143,7 +143,7 @@ void __init msp_serial_setup(void) · 31 unmodified lines
143 }143 }
144 144
145 up.mapbase = MSP_UART1_BASE;145 up.mapbase = MSP_UART1_BASE;
146 up.membase = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);146 up.membase = ioremap(up.mapbase, MSP_UART_REG_LEN);
147 up.irq = MSP_INT_UART1;147 up.irq = MSP_INT_UART1;
148 up.line = 1;148 up.line = 1;
149 up.private_data = (void*)UART1_STATUS_REG;149 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, · 164 unmodified lines
165 res.name))165 res.name))
166 pr_err("Failed to request intc memory");166 pr_err("Failed to request intc memory");
167 167
168 rt_intc_membase = ioremap_nocache(res.start,168 rt_intc_membase = ioremap(res.start,
169 resource_size(&res));169 resource_size(&res));
170 if (!rt_intc_membase)170 if (!rt_intc_membase)
171 panic("Failed to remap intc memory");171 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) · 42 unmodified lines
43 res.name))43 res.name))
44 panic("Failed to request resources for %s", node);44 panic("Failed to request resources for %s", node);
45 45
46 return ioremap_nocache(res.start, resource_size(&res));46 return ioremap(res.start, resource_size(&res));
47}47}
48 48
49void __init device_tree_init(void)49void __init device_tree_init(void)
arch/mips/rb532/devices.c+1−1
@@ -286,7 +286,7 @@ static int __init plat_setup_devices(void) · 285 unmodified lines
286 nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;286 nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
287 287
288 /* Read and map device controller 3 */288 /* Read and map device controller 3 */
289 dev3.base = ioremap_nocache(readl(IDT434_REG_BASE + DEV3BASE), 1);289 dev3.base = ioremap(readl(IDT434_REG_BASE + DEV3BASE), 1);
290 290
291 if (!dev3.base) {291 if (!dev3.base) {
292 printk(KERN_ERR "rb532: cannot remap device controller 3\n");292 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) · 191 unmodified lines
192 struct resource *r;192 struct resource *r;
193 193
194 r = rb532_gpio_reg0_res;194 r = rb532_gpio_reg0_res;
195 rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r));195 rb532_gpio_chip->regbase = ioremap(r->start, resource_size(r));
196 196
197 if (!rb532_gpio_chip->regbase) {197 if (!rb532_gpio_chip->regbase) {
198 printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");198 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) · 109 unmodified lines
110 phys_addr_t memsize;110 phys_addr_t memsize;
111 phys_addr_t ddrbase;111 phys_addr_t ddrbase;
112 112
113 ddr = ioremap_nocache(ddr_reg[0].start,113 ddr = ioremap(ddr_reg[0].start,
114 ddr_reg[0].end - ddr_reg[0].start);114 ddr_reg[0].end - ddr_reg[0].start);
115 115
116 if (!ddr) {116 if (!ddr) {
arch/mips/rb532/setup.c+1−1
@@ -49,7 +49,7 @@ void __init plat_mem_setup(void) · 48 unmodified lines
49 49
50 set_io_port_base(KSEG1);50 set_io_port_base(KSEG1);
51 51
52 pci_reg = ioremap_nocache(pci0_res[0].start,52 pci_reg = ioremap(pci0_res[0].start,
53 pci0_res[0].end - pci0_res[0].start);53 pci0_res[0].end - pci0_res[0].start);
54 if (!pci_reg) {54 if (!pci_reg) {
55 printk(KERN_ERR "Could not remap PCI registers\n");55 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) · 398 unmodified lines
399{399{
400 int i;400 int i;
401 401
402 rm200_pic_master = ioremap_nocache(0x16000020, 4);402 rm200_pic_master = ioremap(0x16000020, 4);
403 if (!rm200_pic_master)403 if (!rm200_pic_master)
404 return;404 return;
405 rm200_pic_slave = ioremap_nocache(0x160000a0, 4);405 rm200_pic_slave = ioremap(0x160000a0, 4);
406 if (!rm200_pic_slave) {406 if (!rm200_pic_slave) {
407 iounmap(rm200_pic_master);407 iounmap(rm200_pic_master);
408 return;408 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) · 127 unmodified lines
128 * The standard PCI ioremap interfaces128 * The standard PCI ioremap interfaces
129 */129 */
130void __iomem *ioremap(unsigned long offset, unsigned long size);130void __iomem *ioremap(unsigned long offset, unsigned long size);
131#define ioremap_nocache(off, sz) ioremap((off), (sz))131#define ioremap_wc ioremap
132#define ioremap_wc ioremap_nocache132#define ioremap_uc ioremap
133#define ioremap_uc ioremap_nocache
134 133
135extern void iounmap(const volatile void __iomem *addr);134extern void iounmap(const volatile void __iomem *addr);
136 135
arch/parisc/kernel/perf.c+1−1
@@ -792,7 +792,7 @@ static int perf_write_image(uint64_t *memaddr) · 791 unmodified lines
792 return -1;792 return -1;
793 }793 }
794 794
795 runway = ioremap_nocache(cpu_device->hpa.start, 4096);795 runway = ioremap(cpu_device->hpa.start, 4096);
796 if (!runway) {796 if (!runway) {
797 pr_err("perf_write_image: ioremap failed!\n");797 pr_err("perf_write_image: ioremap failed!\n");
798 return -ENOMEM;798 return -ENOMEM;
arch/powerpc/include/asm/io.h+0−3
@@ -691,8 +691,6 @@ static inline void iosync(void) · 690 unmodified lines
691 * * ioremap_prot allows to specify the page flags as an argument and can691 * * ioremap_prot allows to specify the page flags as an argument and can
692 * also be hooked by the platform via ppc_md.692 * also be hooked by the platform via ppc_md.
693 *693 *
694 * * ioremap_nocache is identical to ioremap
695 *
696 * * ioremap_wc enables write combining694 * * ioremap_wc enables write combining
697 *695 *
698 * * ioremap_wt enables write through696 * * ioremap_wt enables write through
@@ -715,7 +713,6 @@ extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size, · 16 unmodified lines
715extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);713extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);
716void __iomem *ioremap_wt(phys_addr_t address, unsigned long size);714void __iomem *ioremap_wt(phys_addr_t address, unsigned long size);
717void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size);715void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size);
718#define ioremap_nocache(addr, size) ioremap((addr), (size))
719#define ioremap_uc(addr, size) ioremap((addr), (size))716#define ioremap_uc(addr, size) ioremap((addr), (size))
720#define ioremap_cache(addr, size) \717#define ioremap_cache(addr, size) \
721 ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL))718 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) · 340 unmodified lines
341 pm_power_off = sh7785lcr_power_off;341 pm_power_off = sh7785lcr_power_off;
342 342
343 /* sm501 DRAM configuration */343 /* sm501 DRAM configuration */
344 sm501_reg = ioremap_nocache(SM107_REG_ADDR, SM501_DRAM_CONTROL);344 sm501_reg = ioremap(SM107_REG_ADDR, SM501_DRAM_CONTROL);
345 if (!sm501_reg) {345 if (!sm501_reg) {
346 printk(KERN_ERR "%s: ioremap error.\n", __func__);346 printk(KERN_ERR "%s: ioremap error.\n", __func__);
347 return;347 return;
arch/sh/boards/mach-cayman/irq.c+1−1
@@ -137,7 +137,7 @@ void init_cayman_irq(void) · 136 unmodified lines
137{137{
138 int i;138 int i;
139 139
140 epld_virt = (unsigned long)ioremap_nocache(EPLD_BASE, 1024);140 epld_virt = (unsigned long)ioremap(EPLD_BASE, 1024);
141 if (!epld_virt) {141 if (!epld_virt) {
142 printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n");142 printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n");
143 return;143 return;
arch/sh/boards/mach-cayman/setup.c+1−1
@@ -99,7 +99,7 @@ static int __init smsc_superio_setup(void) · 98 unmodified lines
99{99{
100 unsigned char devid, devrev;100 unsigned char devid, devrev;
101 101
102 smsc_superio_virt = (unsigned long)ioremap_nocache(SMSC_SUPERIO_BASE, 1024);102 smsc_superio_virt = (unsigned long)ioremap(SMSC_SUPERIO_BASE, 1024);
103 if (!smsc_superio_virt) {103 if (!smsc_superio_virt) {
104 panic("Unable to remap SMSC SuperIO\n");104 panic("Unable to remap SMSC SuperIO\n");
105 }105 }
arch/sh/boards/mach-sdk7786/fpga.c+1−1
@@ -32,7 +32,7 @@ static void __iomem *sdk7786_fpga_probe(void) · 31 unmodified lines
32 * is reserved.32 * is reserved.
33 */33 */
34 for (area = PA_AREA0; area < PA_AREA7; area += SZ_64M) {34 for (area = PA_AREA0; area < PA_AREA7; area += SZ_64M) {
35 base = ioremap_nocache(area + FPGA_REGS_OFFSET, FPGA_REGS_SIZE);35 base = ioremap(area + FPGA_REGS_OFFSET, FPGA_REGS_SIZE);
36 if (!base) {36 if (!base) {
37 /* Failed to remap this area, move along. */37 /* Failed to remap this area, move along. */
38 continue;38 continue;
arch/sh/drivers/heartbeat.c+1−1
@@ -96,7 +96,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev) · 95 unmodified lines
96 return -ENOMEM;96 return -ENOMEM;
97 }97 }
98 98
99 hd->base = ioremap_nocache(res->start, resource_size(res));99 hd->base = ioremap(res->start, resource_size(res));
100 if (unlikely(!hd->base)) {100 if (unlikely(!hd->base)) {
101 dev_err(&pdev->dev, "ioremap failed\n");101 dev_err(&pdev->dev, "ioremap failed\n");
102 102
arch/sh/drivers/pci/pci-sh5.c+2−2
@@ -115,12 +115,12 @@ static int __init sh5pci_init(void) · 114 unmodified lines
115 return -EINVAL;115 return -EINVAL;
116 }116 }
117 117
118 pcicr_virt = (unsigned long)ioremap_nocache(SH5PCI_ICR_BASE, 1024);118 pcicr_virt = (unsigned long)ioremap(SH5PCI_ICR_BASE, 1024);
119 if (!pcicr_virt) {119 if (!pcicr_virt) {
120 panic("Unable to remap PCICR\n");120 panic("Unable to remap PCICR\n");
121 }121 }
122 122
123 PCI_IO_AREA = (unsigned long)ioremap_nocache(SH5PCI_IO_BASE, 0x10000);123 PCI_IO_AREA = (unsigned long)ioremap(SH5PCI_IO_BASE, 0x10000);
124 if (!PCI_IO_AREA) {124 if (!PCI_IO_AREA) {
125 panic("Unable to remap PCIIO\n");125 panic("Unable to remap PCIIO\n");
126 }126 }
arch/sh/include/asm/io.h+0−1
@@ -367,7 +367,6 @@ static inline void ioremap_fixed_init(void) { } · 366 unmodified lines
367static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }367static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
368#endif368#endif
369 369
370#define ioremap_nocache ioremap
371#define ioremap_uc ioremap370#define ioremap_uc ioremap
372 371
373/*372/*
arch/sh/kernel/cpu/irq/intc-sh5.c+1−1
@@ -124,7 +124,7 @@ void __init plat_irq_setup(void) · 123 unmodified lines
124 unsigned long reg;124 unsigned long reg;
125 int i;125 int i;
126 126
127 intc_virt = (unsigned long)ioremap_nocache(INTC_BASE, 1024);127 intc_virt = (unsigned long)ioremap(INTC_BASE, 1024);
128 if (!intc_virt) {128 if (!intc_virt) {
129 panic("Unable to remap INTC\n");129 panic("Unable to remap INTC\n");
130 }130 }
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) · 87 unmodified lines
88 if (!np) return;88 if (!np) return;
89 89
90 if (of_property_read_u32_array(np, "cpu-release-addr", regs, 2)) return;90 if (of_property_read_u32_array(np, "cpu-release-addr", regs, 2)) return;
91 release = ioremap_nocache(regs[0], sizeof(u32));91 release = ioremap(regs[0], sizeof(u32));
92 initpc = ioremap_nocache(regs[1], sizeof(u32));92 initpc = ioremap(regs[1], sizeof(u32));
93 93
94 __raw_writel(entry_point, initpc);94 __raw_writel(entry_point, initpc);
95 __raw_writel(1, release);95 __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[] = { · 67 unmodified lines
68 68
69void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)69void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)
70{70{
71 cprc_base = (unsigned long)ioremap_nocache(CPRC_BASE, 1024);71 cprc_base = (unsigned long)ioremap(CPRC_BASE, 1024);
72 BUG_ON(!cprc_base);72 BUG_ON(!cprc_base);
73 73
74 if (idx < ARRAY_SIZE(sh5_clk_ops))74 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, · 27 unmodified lines
28 arch_sync_dma_for_device(virt_to_phys(ret), size,28 arch_sync_dma_for_device(virt_to_phys(ret), size,
29 DMA_BIDIRECTIONAL);29 DMA_BIDIRECTIONAL);
30 30
31 ret_nocache = (void __force *)ioremap_nocache(virt_to_phys(ret), size);31 ret_nocache = (void __force *)ioremap(virt_to_phys(ret), size);
32 if (!ret_nocache) {32 if (!ret_nocache) {
33 free_pages((unsigned long)ret, order);33 free_pages((unsigned long)ret, order);
34 return NULL;34 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) · 405 unmodified lines
406 return (void __iomem *)offset;406 return (void __iomem *)offset;
407}407}
408 408
409#define ioremap_nocache(X,Y) ioremap((X),(Y))
410#define ioremap_uc(X,Y) ioremap((X),(Y))409#define ioremap_uc(X,Y) ioremap((X),(Y))
411#define ioremap_wc(X,Y) ioremap((X),(Y))410#define ioremap_wc(X,Y) ioremap((X),(Y))
412#define ioremap_wt(X,Y) ioremap((X),(Y))411#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); · 30 unmodified lines
31 *31 *
32 */32 */
33#define ioremap(cookie, size) __uc32_ioremap(cookie, size)33#define ioremap(cookie, size) __uc32_ioremap(cookie, size)
34#define ioremap_nocache(cookie, size) __uc32_ioremap(cookie, size)
35#define iounmap(cookie) __uc32_iounmap(cookie)34#define iounmap(cookie) __uc32_iounmap(cookie)
36 35
37#define readb_relaxed readb36#define readb_relaxed readb
arch/x86/kernel/apb_timer.c+1−1
@@ -95,7 +95,7 @@ static inline void apbt_set_mapping(void) · 94 unmodified lines
95 printk(KERN_WARNING "No timer base from SFI, use default\n");95 printk(KERN_WARNING "No timer base from SFI, use default\n");
96 apbt_address = APBT_DEFAULT_BASE;96 apbt_address = APBT_DEFAULT_BASE;
97 }97 }
98 apbt_virt_address = ioremap_nocache(apbt_address, APBT_MMAP_SIZE);98 apbt_virt_address = ioremap(apbt_address, APBT_MMAP_SIZE);
99 if (!apbt_virt_address) {99 if (!apbt_virt_address) {
100 pr_debug("Failed mapping APBT phy address at %lu\n",\100 pr_debug("Failed mapping APBT phy address at %lu\n",\
101 (unsigned long)apbt_address);101 (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) · 83 unmodified lines
84 84
85static inline void hpet_set_mapping(void)85static inline void hpet_set_mapping(void)
86{86{
87 hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);87 hpet_virt_address = ioremap(hpet_address, HPET_MMAP_SIZE);
88}88}
89 89
90static inline void hpet_clear_mapping(void)90static 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) · 109 unmodified lines
110 }110 }
111 111
112 /* use bits 31:14, 16 kB aligned */112 /* use bits 31:14, 16 kB aligned */
113 rcba_base = ioremap_nocache(rcba, 0x4000);113 rcba_base = ioremap(rcba, 0x4000);
114 if (rcba_base == NULL) {114 if (rcba_base == NULL) {
115 dev_printk(KERN_DEBUG, &dev->dev, "ioremap failed; "115 dev_printk(KERN_DEBUG, &dev->dev, "ioremap failed; "
116 "cannot force enable HPET\n");116 "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 c · 353 unmodified lines
354 void *kbuf;354 void *kbuf;
355 int ret = -EFAULT;355 int ret = -EFAULT;
356 356
357 log_base = ioremap_nocache(TBOOT_SERIAL_LOG_ADDR, TBOOT_SERIAL_LOG_SIZE);357 log_base = ioremap(TBOOT_SERIAL_LOG_ADDR, TBOOT_SERIAL_LOG_SIZE);
358 if (!log_base)358 if (!log_base)
359 return ret;359 return ret;
360 360
arch/x86/mm/testmmiotrace.c+2−2
@@ -79,7 +79,7 @@ static void do_read_far_test(void __iomem *p) · 78 unmodified lines
79 79
80static void do_test(unsigned long size)80static void do_test(unsigned long size)
81{81{
82 void __iomem *p = ioremap_nocache(mmio_address, size);82 void __iomem *p = ioremap(mmio_address, size);
83 if (!p) {83 if (!p) {
84 pr_err("could not ioremap, aborting.\n");84 pr_err("could not ioremap, aborting.\n");
85 return;85 return;
@@ -104,7 +104,7 @@ static void do_test_bulk_ioremapping(void) · 18 unmodified lines
104 int i;104 int i;
105 105
106 for (i = 0; i < 10; ++i) {106 for (i = 0; i < 10; ++i) {
107 p = ioremap_nocache(mmio_address, PAGE_SIZE);107 p = ioremap(mmio_address, PAGE_SIZE);
108 if (p)108 if (p)
109 iounmap(p);109 iounmap(p);
110 }110 }
arch/x86/pci/mmconfig_64.c+1−1
@@ -105,7 +105,7 @@ static void __iomem *mcfg_ioremap(struct pci_mmcfg_region *cfg) · 104 unmodified lines
105 start = cfg->address + PCI_MMCFG_BUS_OFFSET(cfg->start_bus);105 start = cfg->address + PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
106 num_buses = cfg->end_bus - cfg->start_bus + 1;106 num_buses = cfg->end_bus - cfg->start_bus + 1;
107 size = PCI_MMCFG_BUS_OFFSET(num_buses);107 size = PCI_MMCFG_BUS_OFFSET(num_buses);
108 addr = ioremap_nocache(start, size);108 addr = ioremap(start, size);
109 if (addr)109 if (addr)
110 addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus);110 addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
111 return addr;111 return addr;
drivers/acpi/acpi_lpit.c+1−1
@@ -104,7 +104,7 @@ static void lpit_update_residency(struct lpit_residency_info *info, · 103 unmodified lines
104 104
105 info->gaddr = lpit_native->residency_counter;105 info->gaddr = lpit_native->residency_counter;
106 if (info->gaddr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {106 if (info->gaddr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
107 info->iomem_addr = ioremap_nocache(info->gaddr.address,107 info->iomem_addr = ioremap(info->gaddr.address,
108 info->gaddr.bit_width / 8);108 info->gaddr.bit_width / 8);
109 if (!info->iomem_addr)109 if (!info->iomem_addr)
110 return;110 return;
drivers/ata/pata_arasan_cf.c+1−1
@@ -824,7 +824,7 @@ static int arasan_cf_probe(struct platform_device *pdev) · 823 unmodified lines
824 quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;824 quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;
825 825
826 acdev->pbase = res->start;826 acdev->pbase = res->start;
827 acdev->vbase = devm_ioremap_nocache(&pdev->dev, res->start,827 acdev->vbase = devm_ioremap(&pdev->dev, res->start,
828 resource_size(res));828 resource_size(res));
829 if (!acdev->vbase) {829 if (!acdev->vbase) {
830 dev_warn(&pdev->dev, "ioremap fail\n");830 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) · 890 unmodified lines
891 of_node_put(dma_node);891 of_node_put(dma_node);
892 return -EINVAL;892 return -EINVAL;
893 }893 }
894 cf_port->dma_base = (u64)devm_ioremap_nocache(&pdev->dev, res_dma->start,894 cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
895 resource_size(res_dma));895 resource_size(res_dma));
896 if (!cf_port->dma_base) {896 if (!cf_port->dma_base) {
897 of_node_put(dma_node);897 of_node_put(dma_node);
@@ -909,7 +909,7 @@ static int octeon_cf_probe(struct platform_device *pdev) · 11 unmodified lines
909 if (!res_cs1)909 if (!res_cs1)
910 return -EINVAL;910 return -EINVAL;
911 911
912 cs1 = devm_ioremap_nocache(&pdev->dev, res_cs1->start,912 cs1 = devm_ioremap(&pdev->dev, res_cs1->start,
913 resource_size(res_cs1));913 resource_size(res_cs1));
914 if (!cs1)914 if (!cs1)
915 return rv;915 return rv;
@@ -925,7 +925,7 @@ static int octeon_cf_probe(struct platform_device *pdev) · 9 unmodified lines
925 if (!res_cs0)925 if (!res_cs0)
926 return -EINVAL;926 return -EINVAL;
927 927
928 cs0 = devm_ioremap_nocache(&pdev->dev, res_cs0->start,928 cs0 = devm_ioremap(&pdev->dev, res_cs0->start,
929 resource_size(res_cs0));929 resource_size(res_cs0));
930 if (!cs0)930 if (!cs0)
931 return rv;931 return rv;
drivers/ata/pata_rb532_cf.c+1−1
@@ -140,7 +140,7 @@ static int rb532_pata_driver_probe(struct platform_device *pdev) · 139 unmodified lines
140 info->gpio_line = gpiod;140 info->gpio_line = gpiod;
141 info->irq = irq;141 info->irq = irq;
142 142
143 info->iobase = devm_ioremap_nocache(&pdev->dev, res->start,143 info->iobase = devm_ioremap(&pdev->dev, res->start,
144 resource_size(res));144 resource_size(res));
145 if (!info->iobase)145 if (!info->iobase)
146 return -ENOMEM;146 return -ENOMEM;
drivers/atm/eni.c+1−7
@@ -31,12 +31,6 @@ · 30 unmodified lines
31#include "suni.h"31#include "suni.h"
32#include "eni.h"32#include "eni.h"
33 33
34#if !defined(__i386__) && !defined(__x86_64__)
35#ifndef ioremap_nocache
36#define ioremap_nocache(X,Y) ioremap(X,Y)
37#endif
38#endif
39
40/*34/*
41 * TODO:35 * TODO:
42 *36 *
@@ -1725,7 +1719,7 @@ static int eni_do_init(struct atm_dev *dev) · 1682 unmodified lines
1725 }1719 }
1726 printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d,base=0x%lx,irq=%d,",1720 printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d,base=0x%lx,irq=%d,",
1727 dev->number,pci_dev->revision,real_base,eni_dev->irq);1721 dev->number,pci_dev->revision,real_base,eni_dev->irq);
1728 if (!(base = ioremap_nocache(real_base,MAP_MAX_SIZE))) {1722 if (!(base = ioremap(real_base,MAP_MAX_SIZE))) {
1729 printk("\n");1723 printk("\n");
1730 printk(KERN_ERR DEV_LABEL "(itf %d): can't set up page "1724 printk(KERN_ERR DEV_LABEL "(itf %d): can't set up page "
1731 "mapping\n",dev->number);1725 "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) · 47 unmodified lines
48 return 0;48 return 0;
49 49
50 ccb->setup_done = 1;50 ccb->setup_done = 1;
51 ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);51 ccb->mii = ioremap(ccb->core->addr_s[1], BCMA_CORE_SIZE);
52 if (!ccb->mii)52 if (!ccb->mii)
53 return -ENOMEM;53 return -ENOMEM;
54 54
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, · 114 unmodified lines
115 if (unlikely(!addr))115 if (unlikely(!addr))
116 goto out;116 goto out;
117 err = -ENOMEM;117 err = -ENOMEM;
118 mmio = ioremap_nocache(addr, sizeof(val));118 mmio = ioremap(addr, sizeof(val));
119 if (!mmio)119 if (!mmio)
120 goto out;120 goto out;
121 121
@@ -180,7 +180,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev, · 58 unmodified lines
180 if (unlikely(!addr))180 if (unlikely(!addr))
181 goto out;181 goto out;
182 err = -ENOMEM;182 err = -ENOMEM;
183 mmio = ioremap_nocache(addr, sizeof(val));183 mmio = ioremap(addr, sizeof(val));
184 if (!mmio)184 if (!mmio)
185 goto out;185 goto out;
186 186
@@ -515,7 +515,7 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) · 328 unmodified lines
515 /* Ok, ready to run, register it to the system.515 /* Ok, ready to run, register it to the system.
516 * The following needs change, if we want to port hostmode516 * The following needs change, if we want to port hostmode
517 * to non-MIPS platform. */517 * to non-MIPS platform. */
518 io_map_base = (unsigned long)ioremap_nocache(pc_host->mem_resource.start,518 io_map_base = (unsigned long)ioremap(pc_host->mem_resource.start,
519 resource_size(&pc_host->mem_resource));519 resource_size(&pc_host->mem_resource));
520 pc_host->pci_controller.io_map_base = io_map_base;520 pc_host->pci_controller.io_map_base = io_map_base;
521 set_io_port_base(pc_host->pci_controller.io_map_base);521 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) · 171 unmodified lines
172 /* iomap only first core. We have to read some register on this core172 /* iomap only first core. We have to read some register on this core
173 * to scan the bus.173 * to scan the bus.
174 */174 */
175 bus->mmio = ioremap_nocache(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);175 bus->mmio = ioremap(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);
176 if (!bus->mmio)176 if (!bus->mmio)
177 return -ENOMEM;177 return -ENOMEM;
178 178
drivers/bcma/scan.c+3−3
@@ -425,11 +425,11 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr, · 424 unmodified lines
425 }425 }
426 }426 }
427 if (bus->hosttype == BCMA_HOSTTYPE_SOC) {427 if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
428 core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);428 core->io_addr = ioremap(core->addr, BCMA_CORE_SIZE);
429 if (!core->io_addr)429 if (!core->io_addr)
430 return -ENOMEM;430 return -ENOMEM;
431 if (core->wrap) {431 if (core->wrap) {
432 core->io_wrap = ioremap_nocache(core->wrap,432 core->io_wrap = ioremap(core->wrap,
433 BCMA_CORE_SIZE);433 BCMA_CORE_SIZE);
434 if (!core->io_wrap) {434 if (!core->io_wrap) {
435 iounmap(core->io_addr);435 iounmap(core->io_addr);
@@ -472,7 +472,7 @@ int bcma_bus_scan(struct bcma_bus *bus) · 36 unmodified lines
472 472
473 erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);473 erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
474 if (bus->hosttype == BCMA_HOSTTYPE_SOC) {474 if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
475 eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);475 eromptr = ioremap(erombase, BCMA_CORE_SIZE);
476 if (!eromptr)476 if (!eromptr)
477 return -ENOMEM;477 return -ENOMEM;
478 } else {478 } 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) · 826 unmodified lines
827 goto failed_req_csr;827 goto failed_req_csr;
828 }828 }
829 829
830 card->csr_remap = ioremap_nocache(csr_base, csr_len);830 card->csr_remap = ioremap(csr_base, csr_len);
831 if (!card->csr_remap) {831 if (!card->csr_remap) {
832 dev_printk(KERN_ERR, &card->dev->dev,832 dev_printk(KERN_ERR, &card->dev->dev,
833 "Unable to remap memory region\n");833 "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, · 96 unmodified lines
97 return -EBUSY;97 return -EBUSY;
98 }98 }
99 99
100 mc_portal_virt_addr = devm_ioremap_nocache(dev,100 mc_portal_virt_addr = devm_ioremap(dev,
101 mc_portal_phys_addr,101 mc_portal_phys_addr,
102 mc_portal_size);102 mc_portal_size);
103 if (!mc_portal_virt_addr) {103 if (!mc_portal_virt_addr) {
104 dev_err(dev,104 dev_err(dev,
105 "devm_ioremap_nocache failed for MC portal %pa\n",105 "devm_ioremap failed for MC portal %pa\n",
106 &mc_portal_phys_addr);106 &mc_portal_phys_addr);
107 return -ENXIO;107 return -ENXIO;
108 }108 }
drivers/char/agp/generic.c+1−1
@@ -941,7 +941,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge) · 940 unmodified lines
941 941
942 bridge->gatt_table = (u32 __iomem *)table;942 bridge->gatt_table = (u32 __iomem *)table;
943#else943#else
944 bridge->gatt_table = ioremap_nocache(virt_to_phys(table),944 bridge->gatt_table = ioremap(virt_to_phys(table),
945 (PAGE_SIZE * (1 << page_order)));945 (PAGE_SIZE * (1 << page_order)));
946 bridge->driver->cache_flush();946 bridge->driver->cache_flush();
947#endif947#endif
drivers/char/agp/intel-gtt.c+1−1
@@ -1087,7 +1087,7 @@ static void intel_i9xx_setup_flush(void) · 1086 unmodified lines
1087 }1087 }
1088 1088
1089 if (intel_private.ifp_resource.start)1089 if (intel_private.ifp_resource.start)
1090 intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE);1090 intel_private.i9xx_flush_page = ioremap(intel_private.ifp_resource.start, PAGE_SIZE);
1091 if (!intel_private.i9xx_flush_page)1091 if (!intel_private.i9xx_flush_page)
1092 dev_err(&intel_private.pcidev->dev,1092 dev_err(&intel_private.pcidev->dev,
1093 "can't ioremap flush page - no chipset flushing\n");1093 "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) · 203 unmodified lines
204 if (pci_enable_device(dev))204 if (pci_enable_device(dev))
205 return -EIO;205 return -EIO;
206 206
207 RamIO = ioremap_nocache(pci_resource_start(dev, 0), LEN_RAM_IO);207 RamIO = ioremap(pci_resource_start(dev, 0), LEN_RAM_IO);
208 208
209 if (!RamIO) {209 if (!RamIO) {
210 printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "210 printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "
@@ -259,7 +259,7 @@ static int __init applicom_init(void) · 48 unmodified lines
259 /* Now try the specified ISA cards */259 /* Now try the specified ISA cards */
260 260
261 for (i = 0; i < MAX_ISA_BOARD; i++) {261 for (i = 0; i < MAX_ISA_BOARD; i++) {
262 RamIO = ioremap_nocache(mem + (LEN_RAM_IO * i), LEN_RAM_IO);262 RamIO = ioremap(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
263 263
264 if (!RamIO) {264 if (!RamIO) {
265 printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1);265 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"; · 316 unmodified lines
317 return -EBUSY;317 return -EBUSY;
318 }318 }
319 319
320 intel_rng_hw->mem = ioremap_nocache(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);320 intel_rng_hw->mem = ioremap(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
321 if (intel_rng_hw->mem == NULL)321 if (intel_rng_hw->mem == NULL)
322 return -EBUSY;322 return -EBUSY;
323 323
drivers/char/hw_random/octeon-rng.c+2−2
@@ -81,13 +81,13 @@ static int octeon_rng_probe(struct platform_device *pdev) · 80 unmodified lines
81 return -ENOENT;81 return -ENOENT;
82 82
83 83
84 rng->control_status = devm_ioremap_nocache(&pdev->dev,84 rng->control_status = devm_ioremap(&pdev->dev,
85 res_ports->start,85 res_ports->start,
86 sizeof(u64));86 sizeof(u64));
87 if (!rng->control_status)87 if (!rng->control_status)
88 return -ENOENT;88 return -ENOENT;
89 89
90 rng->result = devm_ioremap_nocache(&pdev->dev,90 rng->result = devm_ioremap(&pdev->dev,
91 res_result->start,91 res_result->start,
92 sizeof(u64));92 sizeof(u64));
93 if (!rng->result)93 if (!rng->result)
drivers/clk/renesas/clk-rz.c+2−2
@@ -37,8 +37,8 @@ static u16 __init rz_cpg_read_mode_pins(void) · 36 unmodified lines
37 void __iomem *ppr0, *pibc0;37 void __iomem *ppr0, *pibc0;
38 u16 modes;38 u16 modes;
39 39
40 ppr0 = ioremap_nocache(PPR0, 2);40 ppr0 = ioremap(PPR0, 2);
41 pibc0 = ioremap_nocache(PIBC0, 2);41 pibc0 = ioremap(PIBC0, 2);
42 BUG_ON(!ppr0 || !pibc0);42 BUG_ON(!ppr0 || !pibc0);
43 iowrite16(4, pibc0); /* enable input buffer */43 iowrite16(4, pibc0); /* enable input buffer */
44 modes = ioread16(ppr0);44 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) · 904 unmodified lines
905 return -ENXIO;905 return -ENXIO;
906 }906 }
907 907
908 cmt->mapbase = ioremap_nocache(mem->start, resource_size(mem));908 cmt->mapbase = ioremap(mem->start, resource_size(mem));
909 if (cmt->mapbase == NULL) {909 if (cmt->mapbase == NULL) {
910 dev_err(&cmt->pdev->dev, "failed to remap I/O memory\n");910 dev_err(&cmt->pdev->dev, "failed to remap I/O memory\n");
911 return -ENXIO;911 return -ENXIO;
drivers/clocksource/sh_mtu2.c+1−1
@@ -377,7 +377,7 @@ static int sh_mtu2_map_memory(struct sh_mtu2_device *mtu) · 376 unmodified lines
377 return -ENXIO;377 return -ENXIO;
378 }378 }
379 379
380 mtu->mapbase = ioremap_nocache(res->start, resource_size(res));380 mtu->mapbase = ioremap(res->start, resource_size(res));
381 if (mtu->mapbase == NULL)381 if (mtu->mapbase == NULL)
382 return -ENXIO;382 return -ENXIO;
383 383
drivers/clocksource/sh_tmu.c+1−1
@@ -486,7 +486,7 @@ static int sh_tmu_map_memory(struct sh_tmu_device *tmu) · 485 unmodified lines
486 return -ENXIO;486 return -ENXIO;
487 }487 }
488 488
489 tmu->mapbase = ioremap_nocache(res->start, resource_size(res));489 tmu->mapbase = ioremap(res->start, resource_size(res));
490 if (tmu->mapbase == NULL)490 if (tmu->mapbase == NULL)
491 return -ENXIO;491 return -ENXIO;
492 492
drivers/cpufreq/pcc-cpufreq.c+1−1
@@ -445,7 +445,7 @@ static int __init pcc_cpufreq_probe(void) · 444 unmodified lines
445 goto out_free;445 goto out_free;
446 }446 }
447 447
448 pcch_virt_addr = ioremap_nocache(mem_resource->minimum,448 pcch_virt_addr = ioremap(mem_resource->minimum,
449 mem_resource->address_length);449 mem_resource->address_length);
450 if (pcch_virt_addr == NULL) {450 if (pcch_virt_addr == NULL) {
451 pr_debug("probe: could not map shared mem region\n");451 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) · 2506 unmodified lines
2507 addr = pci_resource_start(pdev, i);2507 addr = pci_resource_start(pdev, i);
2508 size = pci_resource_len(pdev, i);2508 size = pci_resource_len(pdev, i);
2509 2509
2510 dev->bar[i] = ioremap_nocache(addr, size);2510 dev->bar[i] = ioremap(addr, size);
2511 if (!dev->bar[i]) {2511 if (!dev->bar[i]) {
2512 err = -ENOMEM;2512 err = -ENOMEM;
2513 goto err_out_unmap_bars;2513 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, · 771 unmodified lines
772 return -EBUSY;772 return -EBUSY;
773 }773 }
774 774
775 *ptr = devm_ioremap_nocache(device, region->start,775 *ptr = devm_ioremap(device, region->start,
776 resource_size(region));776 resource_size(region));
777 if (*ptr == NULL) {777 if (*ptr == NULL) {
778 dev_err(device, "ioremap_nocache of %s failed!", name);778 dev_err(device, "ioremap of %s failed!", name);
779 return -ENOMEM;779 return -ENOMEM;
780 }780 }
781 781
drivers/edac/i3000_edac.c+1−1
@@ -324,7 +324,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) · 323 unmodified lines
324 324
325 pci_read_config_dword(pdev, I3000_MCHBAR, (u32 *) & mchbar);325 pci_read_config_dword(pdev, I3000_MCHBAR, (u32 *) & mchbar);
326 mchbar &= I3000_MCHBAR_MASK;326 mchbar &= I3000_MCHBAR_MASK;
327 window = ioremap_nocache(mchbar, I3000_MMR_WINDOW_SIZE);327 window = ioremap(mchbar, I3000_MMR_WINDOW_SIZE);
328 if (!window) {328 if (!window) {
329 printk(KERN_ERR "i3000: cannot map mmio space at 0x%lx\n",329 printk(KERN_ERR "i3000: cannot map mmio space at 0x%lx\n",
330 mchbar);330 mchbar);
drivers/edac/i3200_edac.c+1−1
@@ -280,7 +280,7 @@ static void __iomem *i3200_map_mchbar(struct pci_dev *pdev) · 279 unmodified lines
280 return NULL;280 return NULL;
281 }281 }
282 282
283 window = ioremap_nocache(u.mchbar, I3200_MMR_WINDOW_SIZE);283 window = ioremap(u.mchbar, I3200_MMR_WINDOW_SIZE);
284 if (!window)284 if (!window)
285 printk(KERN_ERR "i3200: cannot map mmio space at 0x%llx\n",285 printk(KERN_ERR "i3200: cannot map mmio space at 0x%llx\n",
286 (unsigned long long)u.mchbar);286 (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) · 484 unmodified lines
485 goto fail0;485 goto fail0;
486 }486 }
487 mchbar &= 0xffffc000; /* bits 31:14 used for 16K window */487 mchbar &= 0xffffc000; /* bits 31:14 used for 16K window */
488 mch_window = ioremap_nocache(mchbar, 0x1000);488 mch_window = ioremap(mchbar, 0x1000);
489 if (!mch_window) {489 if (!mch_window) {
490 edac_dbg(3, "error ioremapping MCHBAR!\n");490 edac_dbg(3, "error ioremapping MCHBAR!\n");
491 goto fail0;491 goto fail0;
drivers/edac/ie31200_edac.c+1−1
@@ -357,7 +357,7 @@ static void __iomem *ie31200_map_mchbar(struct pci_dev *pdev) · 356 unmodified lines
357 return NULL;357 return NULL;
358 }358 }
359 359
360 window = ioremap_nocache(u.mchbar, IE31200_MMR_WINDOW_SIZE);360 window = ioremap(u.mchbar, IE31200_MMR_WINDOW_SIZE);
361 if (!window)361 if (!window)
362 ie31200_printk(KERN_ERR, "Cannot map mmio space at 0x%llx\n",362 ie31200_printk(KERN_ERR, "Cannot map mmio space at 0x%llx\n",
363 (unsigned long long)u.mchbar);363 (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) · 265 unmodified lines
266 return NULL;266 return NULL;
267 }267 }
268 268
269 window = ioremap_nocache(u.mchbar, X38_MMR_WINDOW_SIZE);269 window = ioremap(u.mchbar, X38_MMR_WINDOW_SIZE);
270 if (!window)270 if (!window)
271 printk(KERN_ERR "x38: cannot map mmio space at 0x%llx\n",271 printk(KERN_ERR "x38: cannot map mmio space at 0x%llx\n",
272 (unsigned long long)u.mchbar);272 (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) · 550 unmodified lines
551 INIT_LIST_HEAD(&lynx->client_list);551 INIT_LIST_HEAD(&lynx->client_list);
552 kref_init(&lynx->kref);552 kref_init(&lynx->kref);
553 553
554 lynx->registers = ioremap_nocache(pci_resource_start(dev, 0),554 lynx->registers = ioremap(pci_resource_start(dev, 0),
555 PCILYNX_MAX_REGISTER);555 PCILYNX_MAX_REGISTER);
556 if (lynx->registers == NULL) {556 if (lynx->registers == NULL) {
557 dev_err(&dev->dev, "Failed to map registers\n");557 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) · 119 unmodified lines
120 void __iomem *iobase;120 void __iomem *iobase;
121 int err;121 int err;
122 122
123 iobase = ioremap_nocache(base, lim);123 iobase = ioremap(base, lim);
124 if (!iobase)124 if (!iobase)
125 return -ENOMEM;125 return -ENOMEM;
126 126
drivers/gpu/drm/gma500/gtt.c+1−1
@@ -503,7 +503,7 @@ int psb_gtt_init(struct drm_device *dev, int resume) · 502 unmodified lines
503 * Map the GTT and the stolen memory area503 * Map the GTT and the stolen memory area
504 */504 */
505 if (!resume)505 if (!resume)
506 dev_priv->gtt_map = ioremap_nocache(pg->gtt_phys_start,506 dev_priv->gtt_map = ioremap(pg->gtt_phys_start,
507 gtt_pages << PAGE_SHIFT);507 gtt_pages << PAGE_SHIFT);
508 if (!dev_priv->gtt_map) {508 if (!dev_priv->gtt_map) {
509 dev_err(dev->dev, "Failure to map gtt.\n");509 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) · 255 unmodified lines
256 PSB_AUX_RESOURCE);256 PSB_AUX_RESOURCE);
257 resource_len = pci_resource_len(dev_priv->aux_pdev,257 resource_len = pci_resource_len(dev_priv->aux_pdev,
258 PSB_AUX_RESOURCE);258 PSB_AUX_RESOURCE);
259 dev_priv->aux_reg = ioremap_nocache(resource_start,259 dev_priv->aux_reg = ioremap(resource_start,
260 resource_len);260 resource_len);
261 if (!dev_priv->aux_reg)261 if (!dev_priv->aux_reg)
262 goto out_err;262 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) · 210 unmodified lines
211 211
212 ioaddr = pci_resource_start(pdev, 1);212 ioaddr = pci_resource_start(pdev, 1);
213 iosize = pci_resource_len(pdev, 1);213 iosize = pci_resource_len(pdev, 1);
214 priv->mmio = devm_ioremap_nocache(dev->dev, ioaddr, iosize);214 priv->mmio = devm_ioremap(dev->dev, ioaddr, iosize);
215 if (!priv->mmio) {215 if (!priv->mmio) {
216 DRM_ERROR("Cannot map mmio region\n");216 DRM_ERROR("Cannot map mmio region\n");
217 return -ENOMEM;217 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) · 2846 unmodified lines
2847 * readback check when writing GTT PTE entries.2847 * readback check when writing GTT PTE entries.
2848 */2848 */
2849 if (IS_GEN9_LP(dev_priv) || INTEL_GEN(dev_priv) >= 10)2849 if (IS_GEN9_LP(dev_priv) || INTEL_GEN(dev_priv) >= 10)
2850 ggtt->gsm = ioremap_nocache(phys_addr, size);2850 ggtt->gsm = ioremap(phys_addr, size);
2851 else2851 else
2852 ggtt->gsm = ioremap_wc(phys_addr, size);2852 ggtt->gsm = ioremap_wc(phys_addr, size);
2853 if (!ggtt->gsm) {2853 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, · 137 unmodified lines
138 138
139 size = resource_size(res);139 size = resource_size(res);
140 140
141 ptr = devm_ioremap_nocache(&pdev->dev, res->start, size);141 ptr = devm_ioremap(&pdev->dev, res->start, size);
142 if (!ptr) {142 if (!ptr) {
143 DRM_DEV_ERROR(&pdev->dev, "failed to ioremap: %s\n", name);143 DRM_DEV_ERROR(&pdev->dev, "failed to ioremap: %s\n", name);
144 return ERR_PTR(-ENOMEM);144 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_ · 442 unmodified lines
443 mem->bus.size);443 mem->bus.size);
444 else444 else
445 mem->bus.addr =445 mem->bus.addr =
446 ioremap_nocache(mem->bus.base + mem->bus.offset,446 ioremap(mem->bus.base + mem->bus.offset,
447 mem->bus.size);447 mem->bus.size);
448 if (!mem->bus.addr)448 if (!mem->bus.addr)
449 return -ENOMEM;449 return -ENOMEM;
drivers/gpu/drm/sti/sti_dvo.c+1−1
@@ -534,7 +534,7 @@ static int sti_dvo_probe(struct platform_device *pdev) · 533 unmodified lines
534 DRM_ERROR("Invalid dvo resource\n");534 DRM_ERROR("Invalid dvo resource\n");
535 return -ENOMEM;535 return -ENOMEM;
536 }536 }
537 dvo->regs = devm_ioremap_nocache(dev, res->start,537 dvo->regs = devm_ioremap(dev, res->start,
538 resource_size(res));538 resource_size(res));
539 if (!dvo->regs)539 if (!dvo->regs)
540 return -ENOMEM;540 return -ENOMEM;
drivers/gpu/drm/sti/sti_hda.c+2−2
@@ -759,14 +759,14 @@ static int sti_hda_probe(struct platform_device *pdev) · 758 unmodified lines
759 DRM_ERROR("Invalid hda resource\n");759 DRM_ERROR("Invalid hda resource\n");
760 return -ENOMEM;760 return -ENOMEM;
761 }761 }
762 hda->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));762 hda->regs = devm_ioremap(dev, res->start, resource_size(res));
763 if (!hda->regs)763 if (!hda->regs)
764 return -ENOMEM;764 return -ENOMEM;
765 765
766 res = platform_get_resource_byname(pdev, IORESOURCE_MEM,766 res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
767 "video-dacs-ctrl");767 "video-dacs-ctrl");
768 if (res) {768 if (res) {
769 hda->video_dacs_ctrl = devm_ioremap_nocache(dev, res->start,769 hda->video_dacs_ctrl = devm_ioremap(dev, res->start,
770 resource_size(res));770 resource_size(res));
771 if (!hda->video_dacs_ctrl)771 if (!hda->video_dacs_ctrl)
772 return -ENOMEM;772 return -ENOMEM;
drivers/gpu/drm/sti/sti_hdmi.c+1−1
@@ -1393,7 +1393,7 @@ static int sti_hdmi_probe(struct platform_device *pdev) · 1392 unmodified lines
1393 ret = -ENOMEM;1393 ret = -ENOMEM;
1394 goto release_adapter;1394 goto release_adapter;
1395 }1395 }
1396 hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));1396 hdmi->regs = devm_ioremap(dev, res->start, resource_size(res));
1397 if (!hdmi->regs) {1397 if (!hdmi->regs) {
1398 ret = -ENOMEM;1398 ret = -ENOMEM;
1399 goto release_adapter;1399 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) · 859 unmodified lines
860 DRM_ERROR("Invalid glue resource\n");860 DRM_ERROR("Invalid glue resource\n");
861 return -ENOMEM;861 return -ENOMEM;
862 }862 }
863 tvout->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));863 tvout->regs = devm_ioremap(dev, res->start, resource_size(res));
864 if (!tvout->regs)864 if (!tvout->regs)
865 return -ENOMEM;865 return -ENOMEM;
866 866
drivers/gpu/drm/sti/sti_vtg.c+1−1
@@ -393,7 +393,7 @@ static int vtg_probe(struct platform_device *pdev) · 392 unmodified lines
393 DRM_ERROR("Get memory resource failed\n");393 DRM_ERROR("Get memory resource failed\n");
394 return -ENOMEM;394 return -ENOMEM;
395 }395 }
396 vtg->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));396 vtg->regs = devm_ioremap(dev, res->start, resource_size(res));
397 if (!vtg->regs) {397 if (!vtg->regs) {
398 DRM_ERROR("failed to remap I/O memory\n");398 DRM_ERROR("failed to remap I/O memory\n");
399 return -ENOMEM;399 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) · 255 unmodified lines
256 goto init_failed;256 goto init_failed;
257 }257 }
258 258
259 priv->mmio = ioremap_nocache(res->start, resource_size(res));259 priv->mmio = ioremap(res->start, resource_size(res));
260 if (!priv->mmio) {260 if (!priv->mmio) {
261 dev_err(dev, "failed to ioremap\n");261 dev_err(dev, "failed to ioremap\n");
262 ret = -ENOMEM;262 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 *m · 217 unmodified lines
218 if (mem->placement & TTM_PL_FLAG_WC)218 if (mem->placement & TTM_PL_FLAG_WC)
219 addr = ioremap_wc(mem->bus.base + mem->bus.offset, mem->bus.size);219 addr = ioremap_wc(mem->bus.base + mem->bus.offset, mem->bus.size);
220 else220 else
221 addr = ioremap_nocache(mem->bus.base + mem->bus.offset, mem->bus.size);221 addr = ioremap(mem->bus.base + mem->bus.offset, mem->bus.size);
222 if (!addr) {222 if (!addr) {
223 (void) ttm_mem_io_lock(man, false);223 (void) ttm_mem_io_lock(man, false);
224 ttm_mem_io_free(bdev, mem);224 ttm_mem_io_free(bdev, mem);
@@ -565,7 +565,7 @@ static int ttm_bo_ioremap(struct ttm_buffer_object *bo, · 340 unmodified lines
565 map->virtual = ioremap_wc(bo->mem.bus.base + bo->mem.bus.offset + offset,565 map->virtual = ioremap_wc(bo->mem.bus.base + bo->mem.bus.offset + offset,
566 size);566 size);
567 else567 else
568 map->virtual = ioremap_nocache(bo->mem.bus.base + bo->mem.bus.offset + offset,568 map->virtual = ioremap(bo->mem.bus.base + bo->mem.bus.offset + offset,
569 size);569 size);
570 }570 }
571 return (!map->virtual) ? -ENOMEM : 0;571 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) · 527 unmodified lines
528 goto err;528 goto err;
529 }529 }
530 530
531 data->amb_mmio = ioremap_nocache(data->amb_base, data->amb_len);531 data->amb_mmio = ioremap(data->amb_base, data->amb_len);
532 if (!data->amb_mmio) {532 if (!data->amb_mmio) {
533 res = -EBUSY;533 res = -EBUSY;
534 goto err_map_failed;534 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) · 368 unmodified lines
369 if (unlikely(!dev))369 if (unlikely(!dev))
370 return -ENOMEM;370 return -ENOMEM;
371 371
372 dev->base = ioremap_nocache(res->start, resource_size(res));372 dev->base = ioremap(res->start, resource_size(res));
373 if (unlikely(!dev->base)) {373 if (unlikely(!dev->base)) {
374 ret = -ENXIO;374 ret = -ENXIO;
375 goto err;375 goto err;
drivers/i2c/busses/i2c-pmcmsp.c+1−1
@@ -281,7 +281,7 @@ static int pmcmsptwi_probe(struct platform_device *pldev) · 280 unmodified lines
281 }281 }
282 282
283 /* remap the memory */283 /* remap the memory */
284 pmcmsptwi_data.iobase = ioremap_nocache(res->start,284 pmcmsptwi_data.iobase = ioremap(res->start,
285 resource_size(res));285 resource_size(res));
286 if (!pmcmsptwi_data.iobase) {286 if (!pmcmsptwi_data.iobase) {
287 dev_err(&pldev->dev,287 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, · 441 unmodified lines
442 goto fail;442 goto fail;
443 }443 }
444 /* Unconditionally map 8 bytes to support 57500 series */444 /* Unconditionally map 8 bytes to support 57500 series */
445 nq->bar_reg_iomem = ioremap_nocache(nq_base + nq->bar_reg_off, 8);445 nq->bar_reg_iomem = ioremap(nq_base + nq->bar_reg_off, 8);
446 if (!nq->bar_reg_iomem) {446 if (!nq->bar_reg_iomem) {
447 rc = -ENOMEM;447 rc = -ENOMEM;
448 goto fail;448 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, · 716 unmodified lines
717 if (!res_base)717 if (!res_base)
718 return -ENOMEM;718 return -ENOMEM;
719 719
720 rcfw->cmdq_bar_reg_iomem = ioremap_nocache(res_base +720 rcfw->cmdq_bar_reg_iomem = ioremap(res_base +
721 RCFW_COMM_BASE_OFFSET,721 RCFW_COMM_BASE_OFFSET,
722 RCFW_COMM_SIZE);722 RCFW_COMM_SIZE);
723 if (!rcfw->cmdq_bar_reg_iomem) {723 if (!rcfw->cmdq_bar_reg_iomem) {
@@ -739,7 +739,7 @@ int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev, · 15 unmodified lines
739 "CREQ BAR region %d resc start is 0!\n",739 "CREQ BAR region %d resc start is 0!\n",
740 rcfw->creq_bar_reg);740 rcfw->creq_bar_reg);
741 /* Unconditionally map 8 bytes to support 57500 series */741 /* Unconditionally map 8 bytes to support 57500 series */
742 rcfw->creq_bar_reg_iomem = ioremap_nocache(res_base + cp_bar_reg_off,742 rcfw->creq_bar_reg_iomem = ioremap(res_base + cp_bar_reg_off,
743 8);743 8);
744 if (!rcfw->creq_bar_reg_iomem) {744 if (!rcfw->creq_bar_reg_iomem) {
745 dev_err(&rcfw->pdev->dev, "CREQ BAR region %d mapping failed\n",745 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, · 703 unmodified lines
704 return -ENOMEM;704 return -ENOMEM;
705 }705 }
706 706
707 dpit->dbr_bar_reg_iomem = ioremap_nocache(bar_reg_base + dbr_offset,707 dpit->dbr_bar_reg_iomem = ioremap(bar_reg_base + dbr_offset,
708 dbr_len);708 dbr_len);
709 if (!dpit->dbr_bar_reg_iomem) {709 if (!dpit->dbr_bar_reg_iomem) {
710 dev_err(&res->pdev->dev,710 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) · 160 unmodified lines
161 return -EINVAL;161 return -EINVAL;
162 }162 }
163 163
164 dd->kregbase1 = ioremap_nocache(addr, RCV_ARRAY);164 dd->kregbase1 = ioremap(addr, RCV_ARRAY);
165 if (!dd->kregbase1) {165 if (!dd->kregbase1) {
166 dd_dev_err(dd, "UC mapping of kregbase1 failed\n");166 dd_dev_err(dd, "UC mapping of kregbase1 failed\n");
167 return -ENOMEM;167 return -ENOMEM;
@@ -179,7 +179,7 @@ int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev) · 11 unmodified lines
179 dd_dev_info(dd, "RcvArray count: %u\n", rcv_array_count);179 dd_dev_info(dd, "RcvArray count: %u\n", rcv_array_count);
180 dd->base2_start = RCV_ARRAY + rcv_array_count * 8;180 dd->base2_start = RCV_ARRAY + rcv_array_count * 8;
181 181
182 dd->kregbase2 = ioremap_nocache(182 dd->kregbase2 = ioremap(
183 addr + dd->base2_start,183 addr + dd->base2_start,
184 TXE_PIO_SEND - dd->base2_start);184 TXE_PIO_SEND - dd->base2_start);
185 if (!dd->kregbase2) {185 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) · 6629 unmodified lines
6630 /* vl15 buffers start just after the 4k buffers */6630 /* vl15 buffers start just after the 4k buffers */
6631 vl15off = dd->physaddr + (dd->piobufbase >> 32) +6631 vl15off = dd->physaddr + (dd->piobufbase >> 32) +
6632 dd->piobcnt4k * dd->align4k;6632 dd->piobcnt4k * dd->align4k;
6633 dd->piovl15base = ioremap_nocache(vl15off,6633 dd->piovl15base = ioremap(vl15off,
6634 NUM_VL15_BUFS * dd->align4k);6634 NUM_VL15_BUFS * dd->align4k);
6635 if (!dd->piovl15base) {6635 if (!dd->piovl15base) {
6636 ret = -ENOMEM;6636 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) · 1758 unmodified lines
1759 qib_userlen = dd->ureg_align * dd->cfgctxts;1759 qib_userlen = dd->ureg_align * dd->cfgctxts;
1760 1760
1761 /* Sanity checks passed, now create the new mappings */1761 /* Sanity checks passed, now create the new mappings */
1762 qib_kregbase = ioremap_nocache(qib_physaddr, qib_kreglen);1762 qib_kregbase = ioremap(qib_physaddr, qib_kreglen);
1763 if (!qib_kregbase)1763 if (!qib_kregbase)
1764 goto bail;1764 goto bail;
1765 1765
@@ -1768,7 +1768,7 @@ int init_chip_wc_pat(struct qib_devdata *dd, u32 vl15buflen) · 2 unmodified lines
1768 goto bail_kregbase;1768 goto bail_kregbase;
1769 1769
1770 if (qib_userlen) {1770 if (qib_userlen) {
1771 qib_userbase = ioremap_nocache(qib_physaddr + dd->uregbase,1771 qib_userbase = ioremap(qib_physaddr + dd->uregbase,
1772 qib_userlen);1772 qib_userlen);
1773 if (!qib_userbase)1773 if (!qib_userbase)
1774 goto bail_piobase;1774 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, · 144 unmodified lines
145 addr = pci_resource_start(pdev, 0);145 addr = pci_resource_start(pdev, 0);
146 len = pci_resource_len(pdev, 0);146 len = pci_resource_len(pdev, 0);
147 147
148 dd->kregbase = ioremap_nocache(addr, len);148 dd->kregbase = ioremap(addr, len);
149 if (!dd->kregbase)149 if (!dd->kregbase)
150 return -ENOMEM;150 return -ENOMEM;
151 151
drivers/input/keyboard/pxa930_rotary.c+1−1
@@ -107,7 +107,7 @@ static int pxa930_rotary_probe(struct platform_device *pdev) · 106 unmodified lines
107 if (!r)107 if (!r)
108 return -ENOMEM;108 return -ENOMEM;
109 109
110 r->mmio_base = ioremap_nocache(res->start, resource_size(res));110 r->mmio_base = ioremap(res->start, resource_size(res));
111 if (r->mmio_base == NULL) {111 if (r->mmio_base == NULL) {
112 dev_err(&pdev->dev, "failed to remap IO memory\n");112 dev_err(&pdev->dev, "failed to remap IO memory\n");
113 err = -ENXIO;113 err = -ENXIO;
drivers/input/keyboard/sh_keysc.c+1−1
@@ -195,7 +195,7 @@ static int sh_keysc_probe(struct platform_device *pdev) · 194 unmodified lines
195 memcpy(&priv->pdata, dev_get_platdata(&pdev->dev), sizeof(priv->pdata));195 memcpy(&priv->pdata, dev_get_platdata(&pdev->dev), sizeof(priv->pdata));
196 pdata = &priv->pdata;196 pdata = &priv->pdata;
197 197
198 priv->iomem_base = ioremap_nocache(res->start, resource_size(res));198 priv->iomem_base = ioremap(res->start, resource_size(res));
199 if (priv->iomem_base == NULL) {199 if (priv->iomem_base == NULL) {
200 dev_err(&pdev->dev, "failed to remap I/O memory\n");200 dev_err(&pdev->dev, "failed to remap I/O memory\n");
201 error = -ENXIO;201 error = -ENXIO;
drivers/input/mouse/pxa930_trkball.c+1−1
@@ -167,7 +167,7 @@ static int pxa930_trkball_probe(struct platform_device *pdev) · 166 unmodified lines
167 goto failed;167 goto failed;
168 }168 }
169 169
170 trkball->mmio_base = ioremap_nocache(res->start, resource_size(res));170 trkball->mmio_base = ioremap(res->start, resource_size(res));
171 if (!trkball->mmio_base) {171 if (!trkball->mmio_base) {
172 dev_err(&pdev->dev, "failed to ioremap registers\n");172 dev_err(&pdev->dev, "failed to ioremap registers\n");
173 error = -ENXIO;173 error = -ENXIO;
drivers/input/serio/gscps2.c+1−1
@@ -349,7 +349,7 @@ static int __init gscps2_probe(struct parisc_device *dev) · 348 unmodified lines
349 349
350 ps2port->port = serio;350 ps2port->port = serio;
351 ps2port->padev = dev;351 ps2port->padev = dev;
352 ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);352 ps2port->addr = ioremap(hpa, GSC_STATUS + 4);
353 spin_lock_init(&ps2port->lock);353 spin_lock_init(&ps2port->lock);
354 354
355 gscps2_reset(ps2port);355 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) · 439 unmodified lines
440 return NULL;440 return NULL;
441 }441 }
442 442
443 return (u8 __iomem *)ioremap_nocache(address, end);443 return (u8 __iomem *)ioremap(address, end);
444}444}
445 445
446static void __init iommu_unmap_mmio_space(struct amd_iommu *iommu)446static 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) · 297 unmodified lines
298 298
299 /* Map internal tpci200 driver user space */299 /* Map internal tpci200 driver user space */
300 tpci200->info->interface_regs =300 tpci200->info->interface_regs =
301 ioremap_nocache(pci_resource_start(tpci200->info->pdev,301 ioremap(pci_resource_start(tpci200->info->pdev,
302 TPCI200_IP_INTERFACE_BAR),302 TPCI200_IP_INTERFACE_BAR),
303 TPCI200_IFACE_SIZE);303 TPCI200_IFACE_SIZE);
304 if (!tpci200->info->interface_regs) {304 if (!tpci200->info->interface_regs) {
@@ -541,7 +541,7 @@ static int tpci200_pci_probe(struct pci_dev *pdev, · 236 unmodified lines
541 ret = -EBUSY;541 ret = -EBUSY;
542 goto out_err_pci_request;542 goto out_err_pci_request;
543 }543 }
544 tpci200->info->cfg_regs = ioremap_nocache(544 tpci200->info->cfg_regs = ioremap(
545 pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),545 pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),
546 pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));546 pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));
547 if (!tpci200->info->cfg_regs) {547 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, · 275 unmodified lines
276 ipoctal->board_id = ipoctal->dev->id_device;276 ipoctal->board_id = ipoctal->dev->id_device;
277 277
278 region = &ipoctal->dev->region[IPACK_IO_SPACE];278 region = &ipoctal->dev->region[IPACK_IO_SPACE];
279 addr = devm_ioremap_nocache(&ipoctal->dev->dev,279 addr = devm_ioremap(&ipoctal->dev->dev,
280 region->start, region->size);280 region->start, region->size);
281 if (!addr) {281 if (!addr) {
282 dev_err(&ipoctal->dev->dev,282 dev_err(&ipoctal->dev->dev,
@@ -292,7 +292,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, · 9 unmodified lines
292 292
293 region = &ipoctal->dev->region[IPACK_INT_SPACE];293 region = &ipoctal->dev->region[IPACK_INT_SPACE];
294 ipoctal->int_space =294 ipoctal->int_space =
295 devm_ioremap_nocache(&ipoctal->dev->dev,295 devm_ioremap(&ipoctal->dev->dev,
296 region->start, region->size);296 region->start, region->size);
297 if (!ipoctal->int_space) {297 if (!ipoctal->int_space) {
298 dev_err(&ipoctal->dev->dev,298 dev_err(&ipoctal->dev->dev,
@@ -303,7 +303,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, · 4 unmodified lines
303 303
304 region = &ipoctal->dev->region[IPACK_MEM8_SPACE];304 region = &ipoctal->dev->region[IPACK_MEM8_SPACE];
305 ipoctal->mem8_space =305 ipoctal->mem8_space =
306 devm_ioremap_nocache(&ipoctal->dev->dev,306 devm_ioremap(&ipoctal->dev->dev,
307 region->start, 0x8000);307 region->start, 0x8000);
308 if (!ipoctal->mem8_space) {308 if (!ipoctal->mem8_space) {
309 dev_err(&ipoctal->dev->dev,309 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, · 715 unmodified lines
716 __sync();716 __sync();
717 }717 }
718 718
719 mips_gic_base = ioremap_nocache(gic_base, gic_len);719 mips_gic_base = ioremap(gic_base, gic_len);
720 720
721 gicconfig = read_gic_config();721 gicconfig = read_gic_config();
722 gic_shared_intrs = gicconfig & GIC_CONFIG_NUMINTERRUPTS;722 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) · 459 unmodified lines
460 goto err0;460 goto err0;
461 }461 }
462 462
463 i->iomem = devm_ioremap_nocache(dev, io[k]->start,463 i->iomem = devm_ioremap(dev, io[k]->start,
464 resource_size(io[k]));464 resource_size(io[k]));
465 if (!i->iomem) {465 if (!i->iomem) {
466 dev_err(dev, "failed to remap IOMEM\n");466 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, · 104 unmodified lines
105 if (nums[i-1] + 1 != nums[i])105 if (nums[i-1] + 1 != nums[i])
106 goto fail_map;106 goto fail_map;
107 buf->vaddr = (__force void *)107 buf->vaddr = (__force void *)
108 ioremap_nocache(__pfn_to_phys(nums[0]), size + offset);108 ioremap(__pfn_to_phys(nums[0]), size + offset);
109 } else {109 } else {
110 buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,110 buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,
111 PAGE_KERNEL);111 PAGE_KERNEL);
drivers/media/pci/cx18/cx18-driver.c+1−1
@@ -938,7 +938,7 @@ static int cx18_probe(struct pci_dev *pci_dev, · 937 unmodified lines
938 /* map io memory */938 /* map io memory */
939 CX18_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",939 CX18_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
940 (u64)cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);940 (u64)cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);
941 cx->enc_mem = ioremap_nocache(cx->base_addr + CX18_MEM_OFFSET,941 cx->enc_mem = ioremap(cx->base_addr + CX18_MEM_OFFSET,
942 CX18_MEM_SIZE);942 CX18_MEM_SIZE);
943 if (!cx->enc_mem) {943 if (!cx->enc_mem) {
944 CX18_ERR("ioremap failed. Can't get a window into CX23418 memory and register space\n");944 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) · 1041 unmodified lines
1042 /* map io memory */1042 /* map io memory */
1043 IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",1043 IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1044 (u64)itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);1044 (u64)itv->base_addr + IVTV_ENCODER_OFFSET, IVTV_ENCODER_SIZE);
1045 itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET,1045 itv->enc_mem = ioremap(itv->base_addr + IVTV_ENCODER_OFFSET,
1046 IVTV_ENCODER_SIZE);1046 IVTV_ENCODER_SIZE);
1047 if (!itv->enc_mem) {1047 if (!itv->enc_mem) {
1048 IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 encoder memory\n");1048 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) · 7 unmodified lines
1056 if (itv->has_cx23415) {1056 if (itv->has_cx23415) {
1057 IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",1057 IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1058 (u64)itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);1058 (u64)itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
1059 itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET,1059 itv->dec_mem = ioremap(itv->base_addr + IVTV_DECODER_OFFSET,
1060 IVTV_DECODER_SIZE);1060 IVTV_DECODER_SIZE);
1061 if (!itv->dec_mem) {1061 if (!itv->dec_mem) {
1062 IVTV_ERR("ioremap failed. Can't get a window into CX23415 decoder memory\n");1062 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) · 12 unmodified lines
1075 IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",1075 IVTV_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
1076 (u64)itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);1076 (u64)itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
1077 itv->reg_mem =1077 itv->reg_mem =
1078 ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);1078 ioremap(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
1079 if (!itv->reg_mem) {1079 if (!itv->reg_mem) {
1080 IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 register space\n");1080 IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 register space\n");
1081 IVTV_ERR("Each capture card with a CX23415/6 needs 64 kB of vmalloc address space for this window\n");1081 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) · 882 unmodified lines
883 goto fail_nores;883 goto fail_nores;
884 }884 }
885 885
886 ccdc_cfg.base_addr = ioremap_nocache(res->start, resource_size(res));886 ccdc_cfg.base_addr = ioremap(res->start, resource_size(res));
887 if (!ccdc_cfg.base_addr) {887 if (!ccdc_cfg.base_addr) {
888 status = -ENOMEM;888 status = -ENOMEM;
889 goto fail_nomem;889 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) · 816 unmodified lines
817 goto fail_nores;817 goto fail_nores;
818 }818 }
819 819
820 ccdc_cfg.base_addr = ioremap_nocache(res->start, resource_size(res));820 ccdc_cfg.base_addr = ioremap(res->start, resource_size(res));
821 if (!ccdc_cfg.base_addr) {821 if (!ccdc_cfg.base_addr) {
822 status = -ENOMEM;822 status = -ENOMEM;
823 goto fail_nomem;823 goto fail_nomem;
drivers/media/platform/davinci/isif.c+1−1
@@ -1045,7 +1045,7 @@ static int isif_probe(struct platform_device *pdev) · 1044 unmodified lines
1045 status = -EBUSY;1045 status = -EBUSY;
1046 goto fail_nobase_res;1046 goto fail_nobase_res;
1047 }1047 }
1048 addr = ioremap_nocache(res->start, resource_size(res));1048 addr = ioremap(res->start, resource_size(res));
1049 if (!addr) {1049 if (!addr) {
1050 status = -ENOMEM;1050 status = -ENOMEM;
1051 goto fail_base_iomap;1051 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) · 350 unmodified lines
351 if (cec->tegra_cec_irq <= 0)351 if (cec->tegra_cec_irq <= 0)
352 return -EBUSY;352 return -EBUSY;
353 353
354 cec->cec_base = devm_ioremap_nocache(&pdev->dev, res->start,354 cec->cec_base = devm_ioremap(&pdev->dev, res->start,
355 resource_size(res));355 resource_size(res));
356 356
357 if (!cec->cec_base) {357 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, · 1511 unmodified lines
1512 bar = 1;1512 bar = 1;
1513 len = pci_resource_len(pcidev, bar);1513 len = pci_resource_len(pcidev, bar);
1514 base = pci_resource_start(pcidev, bar);1514 base = pci_resource_start(pcidev, bar);
1515 pcr->remap_addr = ioremap_nocache(base, len);1515 pcr->remap_addr = ioremap(base, len);
1516 if (!pcr->remap_addr) {1516 if (!pcr->remap_addr) {
1517 ret = -ENOMEM;1517 ret = -ENOMEM;
1518 goto free_handle;1518 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) · 787 unmodified lines
788 "failed to setup interrupts for %d\n", msg->src.node);788 "failed to setup interrupts for %d\n", msg->src.node);
789 goto interrupt_setup_error;789 goto interrupt_setup_error;
790 }790 }
791 newdev->mmio.va = ioremap_nocache(msg->payload[1], sdev->mmio->len);791 newdev->mmio.va = ioremap(msg->payload[1], sdev->mmio->len);
792 if (!newdev->mmio.va) {792 if (!newdev->mmio.va) {
793 dev_err(&scifdev->sdev->dev,793 dev_err(&scifdev->sdev->dev,
794 "failed to map mmio for %d\n", msg->src.node);794 "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, · 833 unmodified lines
834 }834 }
835 drv_data->aperture_base = drv_data->pti_addr+APERTURE_14;835 drv_data->aperture_base = drv_data->pti_addr+APERTURE_14;
836 drv_data->pti_ioaddr =836 drv_data->pti_ioaddr =
837 ioremap_nocache((u32)drv_data->aperture_base,837 ioremap((u32)drv_data->aperture_base,
838 APERTURE_LEN);838 APERTURE_LEN);
839 if (!drv_data->pti_ioaddr) {839 if (!drv_data->pti_ioaddr) {
840 retval = -ENOMEM;840 retval = -ENOMEM;
drivers/mmc/host/sdhci-acpi.c+1−1
@@ -719,7 +719,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev) · 718 unmodified lines
719 goto err_free;719 goto err_free;
720 }720 }
721 721
722 host->ioaddr = devm_ioremap_nocache(dev, iomem->start,722 host->ioaddr = devm_ioremap(dev, iomem->start,
723 resource_size(iomem));723 resource_size(iomem));
724 if (host->ioaddr == NULL) {724 if (host->ioaddr == NULL) {
725 err = -ENOMEM;725 err = -ENOMEM;
drivers/mmc/host/via-sdmmc.c+1−1
@@ -1106,7 +1106,7 @@ static int via_sd_probe(struct pci_dev *pcidev, · 1105 unmodified lines
1106 1106
1107 len = pci_resource_len(pcidev, 0);1107 len = pci_resource_len(pcidev, 0);
1108 base = pci_resource_start(pcidev, 0);1108 base = pci_resource_start(pcidev, 0);
1109 sdhost->mmiobase = ioremap_nocache(base, len);1109 sdhost->mmiobase = ioremap(base, len);
1110 if (!sdhost->mmiobase) {1110 if (!sdhost->mmiobase) {
1111 ret = -ENOMEM;1111 ret = -ENOMEM;
1112 goto free_mmc_host;1112 goto free_mmc_host;
drivers/mtd/devices/bcm47xxsflash.c+1−1
@@ -320,7 +320,7 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) · 319 unmodified lines
320 * ChipCommon revision.320 * ChipCommon revision.
321 */321 */
322 if (b47s->bcma_cc->core->id.rev == 54)322 if (b47s->bcma_cc->core->id.rev == 54)
323 b47s->window = ioremap_nocache(res->start, resource_size(res));323 b47s->window = ioremap(res->start, resource_size(res));
324 else324 else
325 b47s->window = ioremap_cache(res->start, resource_size(res));325 b47s->window = ioremap_cache(res->start, resource_size(res));
326 if (!b47s->window) {326 if (!b47s->window) {
drivers/mtd/maps/amd76xrom.c+1−1
@@ -163,7 +163,7 @@ static int amd76xrom_init_one(struct pci_dev *pdev, · 162 unmodified lines
163 /* FIXME handle registers 0x80 - 0x8C the bios region locks */163 /* FIXME handle registers 0x80 - 0x8C the bios region locks */
164 164
165 /* For write accesses caches are useless */165 /* For write accesses caches are useless */
166 window->virt = ioremap_nocache(window->phys, window->size);166 window->virt = ioremap(window->phys, window->size);
167 if (!window->virt) {167 if (!window->virt) {
168 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",168 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
169 window->phys, window->size);169 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, · 190 unmodified lines
191 /* FIXME handle registers 0x80 - 0x8C the bios region locks */191 /* FIXME handle registers 0x80 - 0x8C the bios region locks */
192 192
193 /* For write accesses caches are useless */193 /* For write accesses caches are useless */
194 window->virt = ioremap_nocache(window->phys, window->size);194 window->virt = ioremap(window->phys, window->size);
195 if (!window->virt) {195 if (!window->virt) {
196 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",196 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
197 window->phys, window->size);197 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, · 248 unmodified lines
249 }249 }
250 250
251 /* Map the firmware hub into my address space. */251 /* Map the firmware hub into my address space. */
252 window->virt = ioremap_nocache(window->phys, window->size);252 window->virt = ioremap(window->phys, window->size);
253 if (!window->virt) {253 if (!window->virt) {
254 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",254 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
255 window->phys, window->size);255 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, · 183 unmodified lines
184 }184 }
185 185
186 /* Map the firmware hub into my address space. */186 /* Map the firmware hub into my address space. */
187 window->virt = ioremap_nocache(window->phys, window->size);187 window->virt = ioremap(window->phys, window->size);
188 if (!window->virt) {188 if (!window->virt) {
189 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",189 printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
190 window->phys, window->size);190 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) · 132 unmodified lines
133 if (win_len < (CS0_START + CS0_SIZE))133 if (win_len < (CS0_START + CS0_SIZE))
134 return -ENXIO;134 return -ENXIO;
135 135
136 p->csr_base = ioremap_nocache(csr_phys, csr_len);136 p->csr_base = ioremap(csr_phys, csr_len);
137 if (!p->csr_base)137 if (!p->csr_base)
138 return -ENOMEM;138 return -ENOMEM;
139 139
@@ -152,7 +152,7 @@ static int vr_nor_init_maps(struct vr_nor_mtd *p) · 12 unmodified lines
152 p->map.bankwidth = (exp_timing_cs0 & TIMING_BYTE_EN) ? 1 : 2;152 p->map.bankwidth = (exp_timing_cs0 & TIMING_BYTE_EN) ? 1 : 2;
153 p->map.phys = win_phys + CS0_START;153 p->map.phys = win_phys + CS0_START;
154 p->map.size = CS0_SIZE;154 p->map.size = CS0_SIZE;
155 p->map.virt = ioremap_nocache(p->map.phys, p->map.size);155 p->map.virt = ioremap(p->map.phys, p->map.size);
156 if (!p->map.virt) {156 if (!p->map.virt) {
157 err = -ENOMEM;157 err = -ENOMEM;
158 goto release;158 goto release;
drivers/mtd/maps/l440gx.c+1−1
@@ -78,7 +78,7 @@ static int __init init_l440gx(void) · 77 unmodified lines
78 return -ENODEV;78 return -ENODEV;
79 }79 }
80 80
81 l440gx_map.virt = ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);81 l440gx_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
82 82
83 if (!l440gx_map.virt) {83 if (!l440gx_map.virt) {
84 printk(KERN_WARNING "Failed to ioremap L440GX flash region\n");84 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) · 81 unmodified lines
82 printk(KERN_NOTICE "NetSc520 flash device: 0x%Lx at 0x%Lx\n",82 printk(KERN_NOTICE "NetSc520 flash device: 0x%Lx at 0x%Lx\n",
83 (unsigned long long)netsc520_map.size,83 (unsigned long long)netsc520_map.size,
84 (unsigned long long)netsc520_map.phys);84 (unsigned long long)netsc520_map.phys);
85 netsc520_map.virt = ioremap_nocache(netsc520_map.phys, netsc520_map.size);85 netsc520_map.virt = ioremap(netsc520_map.phys, netsc520_map.size);
86 86
87 if (!netsc520_map.virt) {87 if (!netsc520_map.virt) {
88 printk("Failed to ioremap_nocache\n");88 printk("Failed to ioremap\n");
89 return -EIO;89 return -EIO;
90 }90 }
91 91
drivers/mtd/maps/nettel.c+4−4
@@ -176,7 +176,7 @@ static int __init nettel_init(void) · 175 unmodified lines
176#endif176#endif
177 int rc = 0;177 int rc = 0;
178 178
179 nettel_mmcrp = (void *) ioremap_nocache(0xfffef000, 4096);179 nettel_mmcrp = (void *) ioremap(0xfffef000, 4096);
180 if (nettel_mmcrp == NULL) {180 if (nettel_mmcrp == NULL) {
181 printk("SNAPGEAR: failed to disable MMCR cache??\n");181 printk("SNAPGEAR: failed to disable MMCR cache??\n");
182 return(-EIO);182 return(-EIO);
@@ -217,7 +217,7 @@ static int __init nettel_init(void) · 34 unmodified lines
217 __asm__ ("wbinvd");217 __asm__ ("wbinvd");
218 218
219 nettel_amd_map.phys = amdaddr;219 nettel_amd_map.phys = amdaddr;
220 nettel_amd_map.virt = ioremap_nocache(amdaddr, maxsize);220 nettel_amd_map.virt = ioremap(amdaddr, maxsize);
221 if (!nettel_amd_map.virt) {221 if (!nettel_amd_map.virt) {
222 printk("SNAPGEAR: failed to ioremap() BOOTCS\n");222 printk("SNAPGEAR: failed to ioremap() BOOTCS\n");
223 iounmap(nettel_mmcrp);223 iounmap(nettel_mmcrp);
@@ -303,7 +303,7 @@ static int __init nettel_init(void) · 79 unmodified lines
303 /* Probe for the size of the first Intel flash */303 /* Probe for the size of the first Intel flash */
304 nettel_intel_map.size = maxsize;304 nettel_intel_map.size = maxsize;
305 nettel_intel_map.phys = intel0addr;305 nettel_intel_map.phys = intel0addr;
306 nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize);306 nettel_intel_map.virt = ioremap(intel0addr, maxsize);
307 if (!nettel_intel_map.virt) {307 if (!nettel_intel_map.virt) {
308 printk("SNAPGEAR: failed to ioremap() ROMCS1\n");308 printk("SNAPGEAR: failed to ioremap() ROMCS1\n");
309 rc = -EIO;309 rc = -EIO;
@@ -337,7 +337,7 @@ static int __init nettel_init(void) · 27 unmodified lines
337 iounmap(nettel_intel_map.virt);337 iounmap(nettel_intel_map.virt);
338 338
339 nettel_intel_map.size = maxsize;339 nettel_intel_map.size = maxsize;
340 nettel_intel_map.virt = ioremap_nocache(intel0addr, maxsize);340 nettel_intel_map.virt = ioremap(intel0addr, maxsize);
341 if (!nettel_intel_map.virt) {341 if (!nettel_intel_map.virt) {
342 printk("SNAPGEAR: failed to ioremap() ROMCS1/2\n");342 printk("SNAPGEAR: failed to ioremap() ROMCS1/2\n");
343 rc = -EIO;343 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) · 93 unmodified lines
94 map->map.write = mtd_pci_write8,94 map->map.write = mtd_pci_write8,
95 95
96 map->map.size = 0x00800000;96 map->map.size = 0x00800000;
97 map->base = ioremap_nocache(pci_resource_start(dev, 0),97 map->base = ioremap(pci_resource_start(dev, 0),
98 pci_resource_len(dev, 0));98 pci_resource_len(dev, 0));
99 99
100 if (!map->base)100 if (!map->base)
@@ -188,7 +188,7 @@ intel_dc21285_init(struct pci_dev *dev, struct map_pci_info *map) · 87 unmodified lines
188 map->map.read = mtd_pci_read32,188 map->map.read = mtd_pci_read32,
189 map->map.write = mtd_pci_write32,189 map->map.write = mtd_pci_write32,
190 map->map.size = len;190 map->map.size = len;
191 map->base = ioremap_nocache(base, len);191 map->base = ioremap(base, len);
192 192
193 if (!map->base)193 if (!map->base)
194 return -ENOMEM;194 return -ENOMEM;
drivers/mtd/maps/sc520cdp.c+4−4
@@ -174,8 +174,8 @@ static void sc520cdp_setup_par(void) · 173 unmodified lines
174 int i, j;174 int i, j;
175 175
176 /* map in SC520's MMCR area */176 /* map in SC520's MMCR area */
177 mmcr = ioremap_nocache(SC520_MMCR_BASE, SC520_MMCR_EXTENT);177 mmcr = ioremap(SC520_MMCR_BASE, SC520_MMCR_EXTENT);
178 if(!mmcr) { /* ioremap_nocache failed: skip the PAR reprogramming */178 if(!mmcr) { /* ioremap failed: skip the PAR reprogramming */
179 /* force physical address fields to BIOS defaults: */179 /* force physical address fields to BIOS defaults: */
180 for(i = 0; i < NUM_FLASH_BANKS; i++)180 for(i = 0; i < NUM_FLASH_BANKS; i++)
181 sc520cdp_map[i].phys = par_table[i].default_address;181 sc520cdp_map[i].phys = par_table[i].default_address;
@@ -225,10 +225,10 @@ static int __init init_sc520cdp(void) · 43 unmodified lines
225 (unsigned long long)sc520cdp_map[i].size,225 (unsigned long long)sc520cdp_map[i].size,
226 (unsigned long long)sc520cdp_map[i].phys);226 (unsigned long long)sc520cdp_map[i].phys);
227 227
228 sc520cdp_map[i].virt = ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);228 sc520cdp_map[i].virt = ioremap(sc520cdp_map[i].phys, sc520cdp_map[i].size);
229 229
230 if (!sc520cdp_map[i].virt) {230 if (!sc520cdp_map[i].virt) {
231 printk("Failed to ioremap_nocache\n");231 printk("Failed to ioremap\n");
232 for (j = 0; j < i; j++) {232 for (j = 0; j < i; j++) {
233 if (mymtd[j]) {233 if (mymtd[j]) {
234 map_destroy(mymtd[j]);234 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, · 151 unmodified lines
152 }152 }
153 153
154 /* remap the IO window (w/o caching) */154 /* remap the IO window (w/o caching) */
155 scb2_ioaddr = ioremap_nocache(SCB2_ADDR, SCB2_WINDOW);155 scb2_ioaddr = ioremap(SCB2_ADDR, SCB2_WINDOW);
156 if (!scb2_ioaddr) {156 if (!scb2_ioaddr) {
157 printk(KERN_ERR MODNAME ": Failed to ioremap window!\n");157 printk(KERN_ERR MODNAME ": Failed to ioremap window!\n");
158 if (!region_fail)158 if (!region_fail)
drivers/mtd/maps/ts5500_flash.c+2−2
@@ -56,10 +56,10 @@ static int __init init_ts5500_map(void) · 55 unmodified lines
56{56{
57 int rc = 0;57 int rc = 0;
58 58
59 ts5500_map.virt = ioremap_nocache(ts5500_map.phys, ts5500_map.size);59 ts5500_map.virt = ioremap(ts5500_map.phys, ts5500_map.size);
60 60
61 if (!ts5500_map.virt) {61 if (!ts5500_map.virt) {
62 printk(KERN_ERR "Failed to ioremap_nocache\n");62 printk(KERN_ERR "Failed to ioremap\n");
63 rc = -EIO;63 rc = -EIO;
64 goto err2;64 goto err2;
65 }65 }
drivers/mtd/nand/raw/au1550nd.c+1−1
@@ -404,7 +404,7 @@ static int au1550nd_probe(struct platform_device *pdev) · 403 unmodified lines
404 goto out1;404 goto out1;
405 }405 }
406 406
407 ctx->base = ioremap_nocache(r->start, 0x1000);407 ctx->base = ioremap(r->start, 0x1000);
408 if (!ctx->base) {408 if (!ctx->base) {
409 dev_err(&pdev->dev, "cannot remap NAND memory area\n");409 dev_err(&pdev->dev, "cannot remap NAND memory area\n");
410 ret = -ENODEV;410 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) · 73 unmodified lines
74 return ret;74 return ret;
75 }75 }
76 76
77 denali->reg = ioremap_nocache(csr_base, csr_len);77 denali->reg = ioremap(csr_base, csr_len);
78 if (!denali->reg) {78 if (!denali->reg) {
79 dev_err(&dev->dev, "Spectra: Unable to remap memory region\n");79 dev_err(&dev->dev, "Spectra: Unable to remap memory region\n");
80 return -ENOMEM;80 return -ENOMEM;
81 }81 }
82 82
83 denali->host = ioremap_nocache(mem_base, mem_len);83 denali->host = ioremap(mem_base, mem_len);
84 if (!denali->host) {84 if (!denali->host) {
85 dev_err(&dev->dev, "Spectra: ioremap_nocache failed!");85 dev_err(&dev->dev, "Spectra: ioremap failed!");
86 ret = -ENOMEM;86 ret = -ENOMEM;
87 goto out_unmap_reg;87 goto out_unmap_reg;
88 }88 }
drivers/mtd/nand/raw/fsl_upm.c+1−1
@@ -285,7 +285,7 @@ static int fun_probe(struct platform_device *ofdev) · 284 unmodified lines
285 fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |285 fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |
286 FSL_UPM_WAIT_WRITE_BYTE;286 FSL_UPM_WAIT_WRITE_BYTE;
287 287
288 fun->io_base = devm_ioremap_nocache(&ofdev->dev, io_res.start,288 fun->io_base = devm_ioremap(&ofdev->dev, io_res.start,
289 resource_size(&io_res));289 resource_size(&io_res));
290 if (!fun->io_base) {290 if (!fun->io_base) {
291 ret = -ENOMEM;291 ret = -ENOMEM;
drivers/net/can/at91_can.c+1−1
@@ -1302,7 +1302,7 @@ static int at91_can_probe(struct platform_device *pdev) · 1301 unmodified lines
1302 goto exit_put;1302 goto exit_put;
1303 }1303 }
1304 1304
1305 addr = ioremap_nocache(res->start, resource_size(res));1305 addr = ioremap(res->start, resource_size(res));
1306 if (!addr) {1306 if (!addr) {
1307 err = -ENOMEM;1307 err = -ENOMEM;
1308 goto exit_release;1308 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) · 174 unmodified lines
175 err = -EBUSY;175 err = -EBUSY;
176 goto exit;176 goto exit;
177 }177 }
178 base = ioremap_nocache(mem[idx], iosize);178 base = ioremap(mem[idx], iosize);
179 if (!base) {179 if (!base) {
180 err = -ENOMEM;180 err = -ENOMEM;
181 goto exit_release;181 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) · 129 unmodified lines
130 err = -EBUSY;130 err = -EBUSY;
131 goto exit;131 goto exit;
132 }132 }
133 base = ioremap_nocache(mem[idx], iosize);133 base = ioremap(mem[idx], iosize);
134 if (!base) {134 if (!base) {
135 err = -ENOMEM;135 err = -ENOMEM;
136 goto exit_release;136 goto exit_release;
drivers/net/can/sja1000/sja1000_platform.c+1−1
@@ -229,7 +229,7 @@ static int sp_probe(struct platform_device *pdev) · 228 unmodified lines
229 resource_size(res_mem), DRV_NAME))229 resource_size(res_mem), DRV_NAME))
230 return -EBUSY;230 return -EBUSY;
231 231
232 addr = devm_ioremap_nocache(&pdev->dev, res_mem->start,232 addr = devm_ioremap(&pdev->dev, res_mem->start,
233 resource_size(res_mem));233 resource_size(res_mem));
234 if (!addr)234 if (!addr)
235 return -ENOMEM;235 return -ENOMEM;
drivers/net/can/softing/softing_main.c+1−1
@@ -777,7 +777,7 @@ static int softing_pdev_probe(struct platform_device *pdev) · 776 unmodified lines
777 goto platform_resource_failed;777 goto platform_resource_failed;
778 card->dpram_phys = pres->start;778 card->dpram_phys = pres->start;
779 card->dpram_size = resource_size(pres);779 card->dpram_size = resource_size(pres);
780 card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);780 card->dpram = ioremap(card->dpram_phys, card->dpram_size);
781 if (!card->dpram) {781 if (!card->dpram) {
782 dev_alert(&card->pdev->dev, "dpram ioremap failed\n");782 dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
783 goto ioremap_failed;783 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) · 1790 unmodified lines
1791 sdev->is_fiber = slic_is_fiber(pdev->subsystem_device);1791 sdev->is_fiber = slic_is_fiber(pdev->subsystem_device);
1792 sdev->pdev = pdev;1792 sdev->pdev = pdev;
1793 sdev->netdev = dev;1793 sdev->netdev = dev;
1794 sdev->regs = ioremap_nocache(pci_resource_start(pdev, 0),1794 sdev->regs = ioremap(pci_resource_start(pdev, 0),
1795 pci_resource_len(pdev, 0));1795 pci_resource_len(pdev, 0));
1796 if (!sdev->regs) {1796 if (!sdev->regs) {
1797 dev_err(&pdev->dev, "failed to map registers\n");1797 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, · 1331 unmodified lines
1332 return -EBUSY;1332 return -EBUSY;
1333 }1333 }
1334 1334
1335 *ptr = devm_ioremap_nocache(device, region->start,1335 *ptr = devm_ioremap(device, region->start,
1336 resource_size(region));1336 resource_size(region));
1337 if (*ptr == NULL) {1337 if (*ptr == NULL) {
1338 dev_err(device, "ioremap_nocache of %s failed!", name);1338 dev_err(device, "ioremap of %s failed!", name);
1339 return -ENOMEM;1339 return -ENOMEM;
1340 }1340 }
1341 1341
drivers/net/ethernet/amd/au1000_eth.c+3−3
@@ -1161,7 +1161,7 @@ static int au1000_probe(struct platform_device *pdev) · 1160 unmodified lines
1161 1161
1162 /* aup->mac is the base address of the MAC's registers */1162 /* aup->mac is the base address of the MAC's registers */
1163 aup->mac = (struct mac_reg *)1163 aup->mac = (struct mac_reg *)
1164 ioremap_nocache(base->start, resource_size(base));1164 ioremap(base->start, resource_size(base));
1165 if (!aup->mac) {1165 if (!aup->mac) {
1166 dev_err(&pdev->dev, "failed to ioremap MAC registers\n");1166 dev_err(&pdev->dev, "failed to ioremap MAC registers\n");
1167 err = -ENXIO;1167 err = -ENXIO;
@@ -1169,7 +1169,7 @@ static int au1000_probe(struct platform_device *pdev) · 1 unmodified line
1169 }1169 }
1170 1170
1171 /* Setup some variables for quick register address access */1171 /* Setup some variables for quick register address access */
1172 aup->enable = (u32 *)ioremap_nocache(macen->start,1172 aup->enable = (u32 *)ioremap(macen->start,
1173 resource_size(macen));1173 resource_size(macen));
1174 if (!aup->enable) {1174 if (!aup->enable) {
1175 dev_err(&pdev->dev, "failed to ioremap MAC enable register\n");1175 dev_err(&pdev->dev, "failed to ioremap MAC enable register\n");
@@ -1178,7 +1178,7 @@ static int au1000_probe(struct platform_device *pdev) · 2 unmodified lines
1178 }1178 }
1179 aup->mac_id = pdev->id;1179 aup->mac_id = pdev->id;
1180 1180
1181 aup->macdma = ioremap_nocache(macdma->start, resource_size(macdma));1181 aup->macdma = ioremap(macdma->start, resource_size(macdma));
1182 if (!aup->macdma) {1182 if (!aup->macdma) {
1183 dev_err(&pdev->dev, "failed to ioremap MACDMA registers\n");1183 dev_err(&pdev->dev, "failed to ioremap MACDMA registers\n");
1184 err = -ENXIO;1184 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, · 252 unmodified lines
253 goto err_free_aq_hw;253 goto err_free_aq_hw;
254 }254 }
255 255
256 self->aq_hw->mmio = ioremap_nocache(mmio_pa, reg_sz);256 self->aq_hw->mmio = ioremap(mmio_pa, reg_sz);
257 if (!self->aq_hw->mmio) {257 if (!self->aq_hw->mmio) {
258 err = -EIO;258 err = -EIO;
259 goto err_free_aq_hw;259 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) · 1686 unmodified lines
1687 goto err_free;1687 goto err_free;
1688 }1688 }
1689 1689
1690 ag->mac_base = devm_ioremap_nocache(&pdev->dev, res->start,1690 ag->mac_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
1691 resource_size(res));
1692 if (!ag->mac_base) {1691 if (!ag->mac_base) {
1693 err = -ENOMEM;1692 err = -ENOMEM;
1694 goto err_free;1693 goto err_free;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c+1−1
@@ -14053,7 +14053,7 @@ static int bnx2x_init_one(struct pci_dev *pdev, · 14052 unmodified lines
14053 rc = -ENOMEM;14053 rc = -ENOMEM;
14054 goto init_one_freemem;14054 goto init_one_freemem;
14055 }14055 }
14056 bp->doorbells = ioremap_nocache(pci_resource_start(pdev, 2),14056 bp->doorbells = ioremap(pci_resource_start(pdev, 2),
14057 doorbell_size);14057 doorbell_size);
14058 }14058 }
14059 if (!bp->doorbells) {14059 if (!bp->doorbells) {
drivers/net/ethernet/broadcom/sb1250-mac.c+1−1
@@ -2537,7 +2537,7 @@ static int sbmac_probe(struct platform_device *pldev) · 2536 unmodified lines
2537 2537
2538 res = platform_get_resource(pldev, IORESOURCE_MEM, 0);2538 res = platform_get_resource(pldev, IORESOURCE_MEM, 0);
2539 BUG_ON(!res);2539 BUG_ON(!res);
2540 sbm_base = ioremap_nocache(res->start, resource_size(res));2540 sbm_base = ioremap(res->start, resource_size(res));
2541 if (!sbm_base) {2541 if (!sbm_base) {
2542 printk(KERN_ERR "%s: unable to map device registers\n",2542 printk(KERN_ERR "%s: unable to map device registers\n",
2543 dev_name(&pldev->dev));2543 dev_name(&pldev->dev));
drivers/net/ethernet/brocade/bna/bnad.c+1−1
@@ -3477,7 +3477,7 @@ bnad_init(struct bnad *bnad, · 3476 unmodified lines
3477 bnad->pcidev = pdev;3477 bnad->pcidev = pdev;
3478 bnad->mmio_start = pci_resource_start(pdev, 0);3478 bnad->mmio_start = pci_resource_start(pdev, 0);
3479 bnad->mmio_len = pci_resource_len(pdev, 0);3479 bnad->mmio_len = pci_resource_len(pdev, 0);
3480 bnad->bar0 = ioremap_nocache(bnad->mmio_start, bnad->mmio_len);3480 bnad->bar0 = ioremap(bnad->mmio_start, bnad->mmio_len);
3481 if (!bnad->bar0) {3481 if (!bnad->bar0) {
3482 dev_err(&pdev->dev, "ioremap for bar0 failed\n");3482 dev_err(&pdev->dev, "ioremap for bar0 failed\n");
3483 return -ENOMEM;3483 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) · 3264 unmodified lines
3265 goto out_free_adapter;3265 goto out_free_adapter;
3266 }3266 }
3267 3267
3268 adapter->regs = ioremap_nocache(mmio_start, mmio_len);3268 adapter->regs = ioremap(mmio_start, mmio_len);
3269 if (!adapter->regs) {3269 if (!adapter->regs) {
3270 dev_err(&pdev->dev, "cannot map device registers\n");3270 dev_err(&pdev->dev, "cannot map device registers\n");
3271 err = -ENOMEM;3271 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) · 2038 unmodified lines
2039 }2039 }
2040 2040
2041 /* remap CSR registers */2041 /* remap CSR registers */
2042 regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);2042 regs = ioremap(pciaddr, DE_REGS_SIZE);
2043 if (!regs) {2043 if (!regs) {
2044 rc = -EIO;2044 rc = -EIO;
2045 pr_err("Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",2045 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) · 1086 unmodified lines
1087 priv = netdev_priv(netdev);1087 priv = netdev_priv(netdev);
1088 priv->netdev = netdev;1088 priv->netdev = netdev;
1089 1089
1090 priv->iobase = devm_ioremap_nocache(&pdev->dev, netdev->base_addr,1090 priv->iobase = devm_ioremap(&pdev->dev, netdev->base_addr,
1091 resource_size(mmio));1091 resource_size(mmio));
1092 if (!priv->iobase) {1092 if (!priv->iobase) {
1093 dev_err(&pdev->dev, "cannot remap I/O memory space\n");1093 dev_err(&pdev->dev, "cannot remap I/O memory space\n");
@@ -1096,7 +1096,7 @@ static int ethoc_probe(struct platform_device *pdev) · 2 unmodified lines
1096 }1096 }
1097 1097
1098 if (netdev->mem_end) {1098 if (netdev->mem_end) {
1099 priv->membase = devm_ioremap_nocache(&pdev->dev,1099 priv->membase = devm_ioremap(&pdev->dev,
1100 netdev->mem_start, resource_size(mem));1100 netdev->mem_start, resource_size(mem));
1101 if (!priv->membase) {1101 if (!priv->membase) {
1102 dev_err(&pdev->dev, "cannot remap memory space\n");1102 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) · 90 unmodified lines
91 idprom = platform_get_resource(dev, IORESOURCE_MEM, 2);91 idprom = platform_get_resource(dev, IORESOURCE_MEM, 2);
92 if (!res || !ca || !options || !idprom)92 if (!res || !ca || !options || !idprom)
93 return -ENODEV;93 return -ENODEV;
94 mpu_addr = ioremap_nocache(res->start, 4);94 mpu_addr = ioremap(res->start, 4);
95 if (!mpu_addr)95 if (!mpu_addr)
96 return -ENOMEM;96 return -ENOMEM;
97 ca_addr = ioremap_nocache(ca->start, 4);97 ca_addr = ioremap(ca->start, 4);
98 if (!ca_addr)98 if (!ca_addr)
99 goto probe_failed_free_mpu;99 goto probe_failed_free_mpu;
100 100
@@ -110,7 +110,7 @@ static int sni_82596_probe(struct platform_device *dev) · 9 unmodified lines
110 netdevice->base_addr = res->start;110 netdevice->base_addr = res->start;
111 netdevice->irq = platform_get_irq(dev, 0);111 netdevice->irq = platform_get_irq(dev, 0);
112 112
113 eth_addr = ioremap_nocache(idprom->start, 0x10);113 eth_addr = ioremap(idprom->start, 0x10);
114 if (!eth_addr)114 if (!eth_addr)
115 goto probe_failed;115 goto probe_failed;
116 116
drivers/net/ethernet/korina.c+3−3
@@ -1043,7 +1043,7 @@ static int korina_probe(struct platform_device *pdev) · 1042 unmodified lines
1043 1043
1044 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");1044 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
1045 dev->base_addr = r->start;1045 dev->base_addr = r->start;
1046 lp->eth_regs = ioremap_nocache(r->start, resource_size(r));1046 lp->eth_regs = ioremap(r->start, resource_size(r));
1047 if (!lp->eth_regs) {1047 if (!lp->eth_regs) {
1048 printk(KERN_ERR DRV_NAME ": cannot remap registers\n");1048 printk(KERN_ERR DRV_NAME ": cannot remap registers\n");
1049 rc = -ENXIO;1049 rc = -ENXIO;
@@ -1051,7 +1051,7 @@ static int korina_probe(struct platform_device *pdev) · 1 unmodified line
1051 }1051 }
1052 1052
1053 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");1053 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");
1054 lp->rx_dma_regs = ioremap_nocache(r->start, resource_size(r));1054 lp->rx_dma_regs = ioremap(r->start, resource_size(r));
1055 if (!lp->rx_dma_regs) {1055 if (!lp->rx_dma_regs) {
1056 printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");1056 printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");
1057 rc = -ENXIO;1057 rc = -ENXIO;
@@ -1059,7 +1059,7 @@ static int korina_probe(struct platform_device *pdev) · 1 unmodified line
1059 }1059 }
1060 1060
1061 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");1061 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");
1062 lp->tx_dma_regs = ioremap_nocache(r->start, resource_size(r));1062 lp->tx_dma_regs = ioremap(r->start, resource_size(r));
1063 if (!lp->tx_dma_regs) {1063 if (!lp->tx_dma_regs) {
1064 printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");1064 printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");
1065 rc = -ENXIO;1065 rc = -ENXIO;
drivers/net/ethernet/lantiq_etop.c+1−1
@@ -649,7 +649,7 @@ ltq_etop_probe(struct platform_device *pdev) · 648 unmodified lines
649 goto err_out;649 goto err_out;
650 }650 }
651 651
652 ltq_etop_membase = devm_ioremap_nocache(&pdev->dev,652 ltq_etop_membase = devm_ioremap(&pdev->dev,
653 res->start, resource_size(res));653 res->start, resource_size(res));
654 if (!ltq_etop_membase) {654 if (!ltq_etop_membase) {
655 dev_err(&pdev->dev, "failed to remap etop engine %d\n",655 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) · 3931 unmodified lines
3932 spin_lock_init(&hw->phy_lock);3932 spin_lock_init(&hw->phy_lock);
3933 tasklet_init(&hw->phy_task, skge_extirq, (unsigned long) hw);3933 tasklet_init(&hw->phy_task, skge_extirq, (unsigned long) hw);
3934 3934
3935 hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);3935 hw->regs = ioremap(pci_resource_start(pdev, 0), 0x4000);
3936 if (!hw->regs) {3936 if (!hw->regs) {
3937 dev_err(&pdev->dev, "cannot map device registers\n");3937 dev_err(&pdev->dev, "cannot map device registers\n");
3938 goto err_out_free_hw;3938 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) · 5021 unmodified lines
5022 hw->pdev = pdev;5022 hw->pdev = pdev;
5023 sprintf(hw->irq_name, DRV_NAME "@pci:%s", pci_name(pdev));5023 sprintf(hw->irq_name, DRV_NAME "@pci:%s", pci_name(pdev));
5024 5024
5025 hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);5025 hw->regs = ioremap(pci_resource_start(pdev, 0), 0x4000);
5026 if (!hw->regs) {5026 if (!hw->regs) {
5027 dev_err(&pdev->dev, "cannot map device registers\n");5027 dev_err(&pdev->dev, "cannot map device registers\n");
5028 goto err_out_free_hw;5028 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, · 1936 unmodified lines
1937 1937
1938 pci_set_master(pci_dev);1938 pci_set_master(pci_dev);
1939 addr = pci_resource_start(pci_dev, 1);1939 addr = pci_resource_start(pci_dev, 1);
1940 dev->base = ioremap_nocache(addr, PAGE_SIZE);1940 dev->base = ioremap(addr, PAGE_SIZE);
1941 dev->tx_descs = pci_alloc_consistent(pci_dev,1941 dev->tx_descs = pci_alloc_consistent(pci_dev,
1942 4 * DESC_SIZE * NR_TX_DESC, &dev->tx_phy_descs);1942 4 * DESC_SIZE * NR_TX_DESC, &dev->tx_phy_descs);
1943 dev->rx_info.descs = pci_alloc_consistent(pci_dev,1943 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, · 105 unmodified lines
106 * first NFP_NET_CFG_BAR_SZ of the BAR. This keeps the code106 * first NFP_NET_CFG_BAR_SZ of the BAR. This keeps the code
107 * the identical for PF and VF drivers.107 * the identical for PF and VF drivers.
108 */108 */
109 ctrl_bar = ioremap_nocache(pci_resource_start(pdev, NFP_NET_CTRL_BAR),109 ctrl_bar = ioremap(pci_resource_start(pdev, NFP_NET_CTRL_BAR),
110 NFP_NET_CFG_BAR_SZ);110 NFP_NET_CFG_BAR_SZ);
111 if (!ctrl_bar) {111 if (!ctrl_bar) {
112 dev_err(&pdev->dev,112 dev_err(&pdev->dev,
@@ -200,7 +200,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, · 87 unmodified lines
200 bar_sz = (rx_bar_off + rx_bar_sz) - bar_off;200 bar_sz = (rx_bar_off + rx_bar_sz) - bar_off;
201 201
202 map_addr = pci_resource_start(pdev, tx_bar_no) + bar_off;202 map_addr = pci_resource_start(pdev, tx_bar_no) + bar_off;
203 vf->q_bar = ioremap_nocache(map_addr, bar_sz);203 vf->q_bar = ioremap(map_addr, bar_sz);
204 if (!vf->q_bar) {204 if (!vf->q_bar) {
205 nn_err(nn, "Failed to map resource %d\n", tx_bar_no);205 nn_err(nn, "Failed to map resource %d\n", tx_bar_no);
206 err = -EIO;206 err = -EIO;
@@ -216,7 +216,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, · 9 unmodified lines
216 216
217 /* TX queues */217 /* TX queues */
218 map_addr = pci_resource_start(pdev, tx_bar_no) + tx_bar_off;218 map_addr = pci_resource_start(pdev, tx_bar_no) + tx_bar_off;
219 nn->tx_bar = ioremap_nocache(map_addr, tx_bar_sz);219 nn->tx_bar = ioremap(map_addr, tx_bar_sz);
220 if (!nn->tx_bar) {220 if (!nn->tx_bar) {
221 nn_err(nn, "Failed to map resource %d\n", tx_bar_no);221 nn_err(nn, "Failed to map resource %d\n", tx_bar_no);
222 err = -EIO;222 err = -EIO;
@@ -225,7 +225,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, · 2 unmodified lines
225 225
226 /* RX queues */226 /* RX queues */
227 map_addr = pci_resource_start(pdev, rx_bar_no) + rx_bar_off;227 map_addr = pci_resource_start(pdev, rx_bar_no) + rx_bar_off;
228 nn->rx_bar = ioremap_nocache(map_addr, rx_bar_sz);228 nn->rx_bar = ioremap(map_addr, rx_bar_sz);
229 if (!nn->rx_bar) {229 if (!nn->rx_bar) {
230 nn_err(nn, "Failed to map resource %d\n", rx_bar_no);230 nn_err(nn, "Failed to map resource %d\n", rx_bar_no);
231 err = -EIO;231 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) · 610 unmodified lines
611 /* Configure, and lock, BAR0.0 for General Target use (MSI-X SRAM) */611 /* Configure, and lock, BAR0.0 for General Target use (MSI-X SRAM) */
612 bar = &nfp->bar[0];612 bar = &nfp->bar[0];
613 if (nfp_bar_resource_len(bar) >= NFP_PCI_MIN_MAP_SIZE)613 if (nfp_bar_resource_len(bar) >= NFP_PCI_MIN_MAP_SIZE)
614 bar->iomem = ioremap_nocache(nfp_bar_resource_start(bar),614 bar->iomem = ioremap(nfp_bar_resource_start(bar),
615 nfp_bar_resource_len(bar));615 nfp_bar_resource_len(bar));
616 if (bar->iomem) {616 if (bar->iomem) {
617 int pf;617 int pf;
@@ -677,7 +677,7 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface) · 59 unmodified lines
677 }677 }
678 678
679 bar = &nfp->bar[4 + i];679 bar = &nfp->bar[4 + i];
680 bar->iomem = ioremap_nocache(nfp_bar_resource_start(bar),680 bar->iomem = ioremap(nfp_bar_resource_start(bar),
681 nfp_bar_resource_len(bar));681 nfp_bar_resource_len(bar));
682 if (bar->iomem) {682 if (bar->iomem) {
683 msg += snprintf(msg, end - msg,683 msg += snprintf(msg, end - msg,
@@ -858,7 +858,7 @@ static int nfp6000_area_acquire(struct nfp_cpp_area *area) · 174 unmodified lines
858 priv->iomem = priv->bar->iomem + priv->bar_offset;858 priv->iomem = priv->bar->iomem + priv->bar_offset;
859 else859 else
860 /* Must have been too big. Sub-allocate. */860 /* Must have been too big. Sub-allocate. */
861 priv->iomem = ioremap_nocache(priv->phys, priv->size);861 priv->iomem = ioremap(priv->phys, priv->size);
862 862
863 if (IS_ERR_OR_NULL(priv->iomem)) {863 if (IS_ERR_OR_NULL(priv->iomem)) {
864 dev_err(nfp->dev, "Can't ioremap() a %d byte region of BAR %d\n",864 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) · 1400 unmodified lines
1401 }1401 }
1402 1402
1403 /* Shrink the original UC mapping of the memory BAR */1403 /* Shrink the original UC mapping of the memory BAR */
1404 membase = ioremap_nocache(efx->membase_phys, uc_mem_map_size);1404 membase = ioremap(efx->membase_phys, uc_mem_map_size);
1405 if (!membase) {1405 if (!membase) {
1406 netif_err(efx, probe, efx->net_dev,1406 netif_err(efx, probe, efx->net_dev,
1407 "could not shrink memory BAR to %x\n",1407 "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) · 1337 unmodified lines
1338 rc = -EIO;1338 rc = -EIO;
1339 goto fail3;1339 goto fail3;
1340 }1340 }
1341 efx->membase = ioremap_nocache(efx->membase_phys, mem_map_size);1341 efx->membase = ioremap(efx->membase_phys, mem_map_size);
1342 if (!efx->membase) {1342 if (!efx->membase) {
1343 netif_err(efx, probe, efx->net_dev,1343 netif_err(efx, probe, efx->net_dev,
1344 "could not map memory BAR at %llx+%x\n",1344 "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) · 1264 unmodified lines
1265 rc = -EIO;1265 rc = -EIO;
1266 goto fail3;1266 goto fail3;
1267 }1267 }
1268 efx->membase = ioremap_nocache(efx->membase_phys, mem_map_size);1268 efx->membase = ioremap(efx->membase_phys, mem_map_size);
1269 if (!efx->membase) {1269 if (!efx->membase) {
1270 netif_err(efx, probe, efx->net_dev,1270 netif_err(efx, probe, efx->net_dev,
1271 "could not map memory BAR at %llx+%x\n",1271 "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) · 2453 unmodified lines
2454 2454
2455 pdata = netdev_priv(dev);2455 pdata = netdev_priv(dev);
2456 dev->irq = irq;2456 dev->irq = irq;
2457 pdata->ioaddr = ioremap_nocache(res->start, res_size);2457 pdata->ioaddr = ioremap(res->start, res_size);
2458 if (!pdata->ioaddr) {2458 if (!pdata->ioaddr) {
2459 retval = -ENOMEM;2459 retval = -ENOMEM;
2460 goto out_ioremap_fail;2460 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, · 2018 unmodified lines
2019 goto quit;2019 goto quit;
2020 }2020 }
2021 2021
2022 efuse = devm_ioremap_nocache(dev, res.start, size);2022 efuse = devm_ioremap(dev, res.start, size);
2023 if (!efuse) {2023 if (!efuse) {
2024 dev_err(dev, "could not map resource\n");2024 dev_err(dev, "could not map resource\n");
2025 devm_release_mem_region(dev, res.start, size);2025 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) · 1201 unmodified lines
1202 1202
1203 /* map device registers */1203 /* map device registers */
1204 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);1204 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1205 lp->regs = devm_ioremap_nocache(&pdev->dev, res->start,1205 lp->regs = devm_ioremap(&pdev->dev, res->start,
1206 resource_size(res));1206 resource_size(res));
1207 if (IS_ERR(lp->regs)) {1207 if (IS_ERR(lp->regs)) {
1208 dev_err(&pdev->dev, "could not map TEMAC registers\n");1208 dev_err(&pdev->dev, "could not map TEMAC registers\n");
@@ -1296,7 +1296,7 @@ static int temac_probe(struct platform_device *pdev) · 87 unmodified lines
1296 } else if (pdata) {1296 } else if (pdata) {
1297 /* 2nd memory resource specifies DMA registers */1297 /* 2nd memory resource specifies DMA registers */
1298 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);1298 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
1299 lp->sdma_regs = devm_ioremap_nocache(&pdev->dev, res->start,1299 lp->sdma_regs = devm_ioremap(&pdev->dev, res->start,
1300 resource_size(res));1300 resource_size(res));
1301 if (IS_ERR(lp->sdma_regs)) {1301 if (IS_ERR(lp->sdma_regs)) {
1302 dev_err(&pdev->dev,1302 dev_err(&pdev->dev,
drivers/net/fddi/defxx.c+1−1
@@ -614,7 +614,7 @@ static int dfx_register(struct device *bdev) · 613 unmodified lines
614 614
615 /* Set up I/O base address. */615 /* Set up I/O base address. */
616 if (dfx_use_mmio) {616 if (dfx_use_mmio) {
617 bp->base.mem = ioremap_nocache(bar_start[0], bar_len[0]);617 bp->base.mem = ioremap(bar_start[0], bar_len[0]);
618 if (!bp->base.mem) {618 if (!bp->base.mem) {
619 printk(KERN_ERR "%s: Cannot map MMIO\n", print_name);619 printk(KERN_ERR "%s: Cannot map MMIO\n", print_name);
620 err = -ENOMEM;620 err = -ENOMEM;
drivers/net/fddi/defza.c+1−1
@@ -1318,7 +1318,7 @@ static int fza_probe(struct device *bdev) · 1317 unmodified lines
1318 }1318 }
1319 1319
1320 /* MMIO mapping setup. */1320 /* MMIO mapping setup. */
1321 mmio = ioremap_nocache(start, len);1321 mmio = ioremap(start, len);
1322 if (!mmio) {1322 if (!mmio) {
1323 pr_err("%s: cannot map MMIO\n", fp->name);1323 pr_err("%s: cannot map MMIO\n", fp->name);
1324 ret = -ENOMEM;1324 ret = -ENOMEM;
drivers/net/fjes/fjes_hw.c+1−1
@@ -40,7 +40,7 @@ static u8 *fjes_hw_iomap(struct fjes_hw *hw) · 39 unmodified lines
40 return NULL;40 return NULL;
41 }41 }
42 42
43 base = (u8 *)ioremap_nocache(hw->hw_res.start, hw->hw_res.size);43 base = (u8 *)ioremap(hw->hw_res.start, hw->hw_res.size);
44 44
45 return base;45 return base;
46}46}
drivers/net/wan/wanxl.c+2−2
@@ -635,7 +635,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev, · 634 unmodified lines
635 /* set up PLX mapping */635 /* set up PLX mapping */
636 plx_phy = pci_resource_start(pdev, 0);636 plx_phy = pci_resource_start(pdev, 0);
637 637
638 card->plx = ioremap_nocache(plx_phy, 0x70);638 card->plx = ioremap(plx_phy, 0x70);
639 if (!card->plx) {639 if (!card->plx) {
640 pr_err("ioremap() failed\n");640 pr_err("ioremap() failed\n");
641 wanxl_pci_remove_one(pdev);641 wanxl_pci_remove_one(pdev);
@@ -704,7 +704,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev, · 62 unmodified lines
704 PCI_DMA_FROMDEVICE);704 PCI_DMA_FROMDEVICE);
705 }705 }
706 706
707 mem = ioremap_nocache(mem_phy, PDM_OFFSET + sizeof(firmware));707 mem = ioremap(mem_phy, PDM_OFFSET + sizeof(firmware));
708 if (!mem) {708 if (!mem) {
709 pr_err("ioremap() failed\n");709 pr_err("ioremap() failed\n");
710 wanxl_pci_remove_one(pdev);710 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) · 457 unmodified lines
458 458
459 ar_ahb->mem_len = resource_size(res);459 ar_ahb->mem_len = resource_size(res);
460 460
461 ar_ahb->gcc_mem = ioremap_nocache(ATH10K_GCC_REG_BASE,461 ar_ahb->gcc_mem = ioremap(ATH10K_GCC_REG_BASE,
462 ATH10K_GCC_REG_SIZE);462 ATH10K_GCC_REG_SIZE);
463 if (!ar_ahb->gcc_mem) {463 if (!ar_ahb->gcc_mem) {
464 ath10k_err(ar, "gcc mem ioremap error\n");464 ath10k_err(ar, "gcc mem ioremap error\n");
@@ -466,7 +466,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar) · 1 unmodified line
466 goto err_mem_unmap;466 goto err_mem_unmap;
467 }467 }
468 468
469 ar_ahb->tcsr_mem = ioremap_nocache(ATH10K_TCSR_REG_BASE,469 ar_ahb->tcsr_mem = ioremap(ATH10K_TCSR_REG_BASE,
470 ATH10K_TCSR_REG_SIZE);470 ATH10K_TCSR_REG_SIZE);
471 if (!ar_ahb->tcsr_mem) {471 if (!ar_ahb->tcsr_mem) {
472 ath10k_err(ar, "tcsr mem ioremap error\n");472 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) · 105 unmodified lines
106 goto err_out;106 goto err_out;
107 }107 }
108 108
109 mem = ioremap_nocache(res->start, resource_size(res));109 mem = ioremap(res->start, resource_size(res));
110 if (mem == NULL) {110 if (mem == NULL) {
111 dev_err(&pdev->dev, "ioremap failed\n");111 dev_err(&pdev->dev, "ioremap failed\n");
112 ret = -ENOMEM;112 ret = -ENOMEM;
drivers/net/wireless/ath/ath9k/ahb.c+1−1
@@ -92,7 +92,7 @@ static int ath_ahb_probe(struct platform_device *pdev) · 91 unmodified lines
92 return -ENXIO;92 return -ENXIO;
93 }93 }
94 94
95 mem = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res));95 mem = devm_ioremap(&pdev->dev, res->start, resource_size(res));
96 if (mem == NULL) {96 if (mem == NULL) {
97 dev_err(&pdev->dev, "ioremap failed\n");97 dev_err(&pdev->dev, "ioremap failed\n");
98 return -ENOMEM;98 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) · 1642 unmodified lines
1643 return -EINVAL;1643 return -EINVAL;
1644 }1644 }
1645 1645
1646 devinfo->regs = ioremap_nocache(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);1646 devinfo->regs = ioremap(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);
1647 devinfo->tcm = ioremap_nocache(bar1_addr, bar1_size);1647 devinfo->tcm = ioremap(bar1_addr, bar1_size);
1648 1648
1649 if (!devinfo->regs || !devinfo->tcm) {1649 if (!devinfo->regs || !devinfo->tcm) {
1650 brcmf_err(bus, "ioremap() failed (%p,%p)\n", devinfo->regs,1650 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, · 6166 unmodified lines
6167 ioaddr = pci_iomap(pci_dev, 0, 0);6167 ioaddr = pci_iomap(pci_dev, 0, 0);
6168 if (!ioaddr) {6168 if (!ioaddr) {
6169 printk(KERN_WARNING DRV_NAME6169 printk(KERN_WARNING DRV_NAME
6170 "Error calling ioremap_nocache.\n");6170 "Error calling ioremap.\n");
6171 err = -EIO;6171 err = -EIO;
6172 goto fail;6172 goto fail;
6173 }6173 }
drivers/opp/ti-opp-supply.c+1−1
@@ -90,7 +90,7 @@ static int _store_optimized_voltages(struct device *dev, · 89 unmodified lines
90 goto out_map;90 goto out_map;
91 }91 }
92 92
93 base = ioremap_nocache(res->start, resource_size(res));93 base = ioremap(res->start, resource_size(res));
94 if (!base) {94 if (!base) {
95 dev_err(dev, "Unable to map Efuse registers\n");95 dev_err(dev, "Unable to map Efuse registers\n");
96 ret = -ENOMEM;96 ret = -ENOMEM;
drivers/parisc/ccio-dma.c+1−1
@@ -1534,7 +1534,7 @@ static int __init ccio_probe(struct parisc_device *dev) · 1533 unmodified lines
1534 *ioc_p = ioc;1534 *ioc_p = ioc;
1535 1535
1536 ioc->hw_path = dev->hw_path;1536 ioc->hw_path = dev->hw_path;
1537 ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096);1537 ioc->ioc_regs = ioremap(dev->hpa.start, 4096);
1538 if (!ioc->ioc_regs) {1538 if (!ioc->ioc_regs) {
1539 kfree(ioc);1539 kfree(ioc);
1540 return -ENOMEM;1540 return -ENOMEM;
drivers/parisc/dino.c+1−1
@@ -974,7 +974,7 @@ static int __init dino_probe(struct parisc_device *dev) · 973 unmodified lines
974 }974 }
975 975
976 dino_dev->hba.dev = dev;976 dino_dev->hba.dev = dev;
977 dino_dev->hba.base_addr = ioremap_nocache(hpa, 4096);977 dino_dev->hba.base_addr = ioremap(hpa, 4096);
978 dino_dev->hba.lmmio_space_offset = PCI_F_EXTEND;978 dino_dev->hba.lmmio_space_offset = PCI_F_EXTEND;
979 spin_lock_init(&dino_dev->dinosaur_pen);979 spin_lock_init(&dino_dev->dinosaur_pen);
980 dino_dev->hba.iommu = ccio_get_iommu(dev);980 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) · 353 unmodified lines
354 eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;354 eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;
355 }355 }
356 }356 }
357 eisa_eeprom_addr = ioremap_nocache(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);357 eisa_eeprom_addr = ioremap(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
358 if (!eisa_eeprom_addr) {358 if (!eisa_eeprom_addr) {
359 result = -ENOMEM;359 result = -ENOMEM;
360 printk(KERN_ERR "EISA: ioremap_nocache failed!\n");360 printk(KERN_ERR "EISA: ioremap failed!\n");
361 goto error_free_irq;361 goto error_free_irq;
362 }362 }
363 result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space,363 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) · 926 unmodified lines
927 return NULL;927 return NULL;
928 }928 }
929 929
930 isi->addr = ioremap_nocache(hpa, 4096);930 isi->addr = ioremap(hpa, 4096);
931 isi->isi_hpa = hpa;931 isi->isi_hpa = hpa;
932 isi->isi_version = iosapic_rd_version(isi);932 isi->isi_version = iosapic_rd_version(isi);
933 isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;933 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) · 1133 unmodified lines
1134 ** Postable I/O port space is per PCI host adapter.1134 ** Postable I/O port space is per PCI host adapter.
1135 ** base of 64MB PIOP region1135 ** base of 64MB PIOP region
1136 */1136 */
1137 lba_dev->iop_base = ioremap_nocache(p->start, 64 * 1024 * 1024);1137 lba_dev->iop_base = ioremap(p->start, 64 * 1024 * 1024);
1138 1138
1139 sprintf(lba_dev->hba.io_name, "PCI%02x Ports",1139 sprintf(lba_dev->hba.io_name, "PCI%02x Ports",
1140 (int)lba_dev->hba.bus_num.start);1140 (int)lba_dev->hba.bus_num.start);
@@ -1476,7 +1476,7 @@ lba_driver_probe(struct parisc_device *dev) · 335 unmodified lines
1476 u32 func_class;1476 u32 func_class;
1477 void *tmp_obj;1477 void *tmp_obj;
1478 char *version;1478 char *version;
1479 void __iomem *addr = ioremap_nocache(dev->hpa.start, 4096);1479 void __iomem *addr = ioremap(dev->hpa.start, 4096);
1480 int max;1480 int max;
1481 1481
1482 /* Read HW Rev First */1482 /* Read HW Rev First */
@@ -1575,7 +1575,7 @@ lba_driver_probe(struct parisc_device *dev) · 92 unmodified lines
1575 } else {1575 } else {
1576 if (!astro_iop_base) {1576 if (!astro_iop_base) {
1577 /* Sprockets PDC uses NPIOP region */1577 /* Sprockets PDC uses NPIOP region */
1578 astro_iop_base = ioremap_nocache(LBA_PORT_BASE, 64 * 1024);1578 astro_iop_base = ioremap(LBA_PORT_BASE, 64 * 1024);
1579 pci_port = &lba_astro_port_ops;1579 pci_port = &lba_astro_port_ops;
1580 }1580 }
1581 1581
@@ -1693,7 +1693,7 @@ void __init lba_init(void) · 111 unmodified lines
1693*/1693*/
1694void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)1694void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
1695{1695{
1696 void __iomem * base_addr = ioremap_nocache(lba->hpa.start, 4096);1696 void __iomem * base_addr = ioremap(lba->hpa.start, 4096);
1697 1697
1698 imask <<= 2; /* adjust for hints - 2 more bits */1698 imask <<= 2; /* adjust for hints - 2 more bits */
1699 1699
drivers/parisc/sba_iommu.c+2−2
@@ -1513,7 +1513,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num) · 1512 unmodified lines
1513 1513
1514static void __iomem *ioc_remap(struct sba_device *sba_dev, unsigned int offset)1514static void __iomem *ioc_remap(struct sba_device *sba_dev, unsigned int offset)
1515{1515{
1516 return ioremap_nocache(sba_dev->dev->hpa.start + offset, SBA_FUNC_SIZE);1516 return ioremap(sba_dev->dev->hpa.start + offset, SBA_FUNC_SIZE);
1517}1517}
1518 1518
1519static void sba_hw_init(struct sba_device *sba_dev)1519static void sba_hw_init(struct sba_device *sba_dev)
@@ -1883,7 +1883,7 @@ static int __init sba_driver_callback(struct parisc_device *dev) · 363 unmodified lines
1883 u32 func_class;1883 u32 func_class;
1884 int i;1884 int i;
1885 char *version;1885 char *version;
1886 void __iomem *sba_addr = ioremap_nocache(dev->hpa.start, SBA_FUNC_SIZE);1886 void __iomem *sba_addr = ioremap(dev->hpa.start, SBA_FUNC_SIZE);
1887#ifdef CONFIG_PROC_FS1887#ifdef CONFIG_PROC_FS
1888 struct proc_dir_entry *root;1888 struct proc_dir_entry *root;
1889#endif1889#endif
drivers/pci/controller/dwc/pci-dra7xx.c+1−1
@@ -719,7 +719,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) · 718 unmodified lines
719 }719 }
720 720
721 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ti_conf");721 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ti_conf");
722 base = devm_ioremap_nocache(dev, res->start, resource_size(res));722 base = devm_ioremap(dev, res->start, resource_size(res));
723 if (!base)723 if (!base)
724 return -ENOMEM;724 return -ENOMEM;
725 725
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, · 433 unmodified lines
434 tbl_addr += (tbl_offset + ((interrupt_num - 1) * PCI_MSIX_ENTRY_SIZE));434 tbl_addr += (tbl_offset + ((interrupt_num - 1) * PCI_MSIX_ENTRY_SIZE));
435 tbl_addr &= PCI_BASE_ADDRESS_MEM_MASK;435 tbl_addr &= PCI_BASE_ADDRESS_MEM_MASK;
436 436
437 msix_tbl = ioremap_nocache(ep->phys_base + tbl_addr,437 msix_tbl = ioremap(ep->phys_base + tbl_addr,
438 PCI_MSIX_ENTRY_SIZE);438 PCI_MSIX_ENTRY_SIZE);
439 if (!msix_tbl)439 if (!msix_tbl)
440 return -EINVAL;440 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) · 687 unmodified lines
688 table_offset &= PCI_MSIX_TABLE_OFFSET;688 table_offset &= PCI_MSIX_TABLE_OFFSET;
689 phys_addr = pci_resource_start(dev, bir) + table_offset;689 phys_addr = pci_resource_start(dev, bir) + table_offset;
690 690
691 return ioremap_nocache(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE);691 return ioremap(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE);
692}692}
693 693
694static int msix_setup_entries(struct pci_dev *dev, void __iomem *base,694static 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) · 183 unmodified lines
184 pci_warn(pdev, "can't ioremap BAR %d: %pR\n", bar, res);184 pci_warn(pdev, "can't ioremap BAR %d: %pR\n", bar, res);
185 return NULL;185 return NULL;
186 }186 }
187 return ioremap_nocache(res->start, resource_size(res));187 return ioremap(res->start, resource_size(res));
188}188}
189EXPORT_SYMBOL_GPL(pci_ioremap_bar);189EXPORT_SYMBOL_GPL(pci_ioremap_bar);
190 190
drivers/pci/quirks.c+2−2
@@ -1571,7 +1571,7 @@ static void asus_hides_smbus_lpc_ich6_suspend(struct pci_dev *dev) · 1570 unmodified lines
1571 1571
1572 pci_read_config_dword(dev, 0xF0, &rcba);1572 pci_read_config_dword(dev, 0xF0, &rcba);
1573 /* use bits 31:14, 16 kB aligned */1573 /* use bits 31:14, 16 kB aligned */
1574 asus_rcba_base = ioremap_nocache(rcba & 0xFFFFC000, 0x4000);1574 asus_rcba_base = ioremap(rcba & 0xFFFFC000, 0x4000);
1575 if (asus_rcba_base == NULL)1575 if (asus_rcba_base == NULL)
1576 return;1576 return;
1577}1577}
@@ -4784,7 +4784,7 @@ static int pci_quirk_enable_intel_lpc_acs(struct pci_dev *dev) · 3206 unmodified lines
4784 if (!(rcba & INTEL_LPC_RCBA_ENABLE))4784 if (!(rcba & INTEL_LPC_RCBA_ENABLE))
4785 return -EINVAL;4785 return -EINVAL;
4786 4786
4787 rcba_mem = ioremap_nocache(rcba & INTEL_LPC_RCBA_MASK,4787 rcba_mem = ioremap(rcba & INTEL_LPC_RCBA_MASK,
4788 PAGE_ALIGN(INTEL_UPDCR_REG));4788 PAGE_ALIGN(INTEL_UPDCR_REG));
4789 if (!rcba_mem)4789 if (!rcba_mem)
4790 return -ENOMEM;4790 return -ENOMEM;
drivers/pinctrl/bcm/pinctrl-ns2-mux.c+1−1
@@ -1049,7 +1049,7 @@ static int ns2_pinmux_probe(struct platform_device *pdev) · 1048 unmodified lines
1049 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);1049 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
1050 if (!res)1050 if (!res)
1051 return -EINVAL;1051 return -EINVAL;
1052 pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,1052 pinctrl->base1 = devm_ioremap(&pdev->dev, res->start,
1053 resource_size(res));1053 resource_size(res));
1054 if (!pinctrl->base1) {1054 if (!pinctrl->base1) {
1055 dev_err(&pdev->dev, "unable to map I/O space\n");1055 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) · 577 unmodified lines
578 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);578 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
579 if (!res)579 if (!res)
580 return -EINVAL;580 return -EINVAL;
581 pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,581 pinctrl->base1 = devm_ioremap(&pdev->dev, res->start,
582 resource_size(res));582 resource_size(res));
583 if (!pinctrl->base1) {583 if (!pinctrl->base1) {
584 dev_err(&pdev->dev, "unable to map I/O space\n");584 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, · 610 unmodified lines
611 if (!res)611 if (!res)
612 return -ENOENT;612 return -ENOENT;
613 613
614 ipctl->base = devm_ioremap_nocache(&pdev->dev, res->start,614 ipctl->base = devm_ioremap(&pdev->dev, res->start,
615 resource_size(res));615 resource_size(res));
616 if (!ipctl->base)616 if (!ipctl->base)
617 return -ENOMEM;617 return -ENOMEM;
drivers/pinctrl/pinctrl-amd.c+1−1
@@ -866,7 +866,7 @@ static int amd_gpio_probe(struct platform_device *pdev) · 865 unmodified lines
866 return -EINVAL;866 return -EINVAL;
867 }867 }
868 868
869 gpio_dev->base = devm_ioremap_nocache(&pdev->dev, res->start,869 gpio_dev->base = devm_ioremap(&pdev->dev, res->start,
870 resource_size(res));870 resource_size(res));
871 if (!gpio_dev->base)871 if (!gpio_dev->base)
872 return -ENOMEM;872 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) · 651 unmodified lines
652 652
653 scu->ipc_base = pcim_iomap_table(pdev)[0];653 scu->ipc_base = pcim_iomap_table(pdev)[0];
654 654
655 scu->i2c_base = ioremap_nocache(pdata->i2c_base, pdata->i2c_len);655 scu->i2c_base = ioremap(pdata->i2c_base, pdata->i2c_len);
656 if (!scu->i2c_base)656 if (!scu->i2c_base)
657 return -ENOMEM;657 return -ENOMEM;
658 658
drivers/platform/x86/intel_telemetry_pltdrv.c+2−2
@@ -1156,7 +1156,7 @@ static int telemetry_pltdrv_probe(struct platform_device *pdev) · 1155 unmodified lines
1156 telm_conf->ioss_config.ssram_base_addr = res1->start;1156 telm_conf->ioss_config.ssram_base_addr = res1->start;
1157 telm_conf->ioss_config.ssram_size = size;1157 telm_conf->ioss_config.ssram_size = size;
1158 1158
1159 telm_conf->pss_config.regmap = ioremap_nocache(1159 telm_conf->pss_config.regmap = ioremap(
1160 telm_conf->pss_config.ssram_base_addr,1160 telm_conf->pss_config.ssram_base_addr,
1161 telm_conf->pss_config.ssram_size);1161 telm_conf->pss_config.ssram_size);
1162 if (!telm_conf->pss_config.regmap) {1162 if (!telm_conf->pss_config.regmap) {
@@ -1164,7 +1164,7 @@ static int telemetry_pltdrv_probe(struct platform_device *pdev) · 1 unmodified line
1164 goto out;1164 goto out;
1165 }1165 }
1166 1166
1167 telm_conf->ioss_config.regmap = ioremap_nocache(1167 telm_conf->ioss_config.regmap = ioremap(
1168 telm_conf->ioss_config.ssram_base_addr,1168 telm_conf->ioss_config.ssram_base_addr,
1169 telm_conf->ioss_config.ssram_size);1169 telm_conf->ioss_config.ssram_size);
1170 if (!telm_conf->ioss_config.regmap) {1170 if (!telm_conf->ioss_config.regmap) {
drivers/platform/x86/pmc_atom.c+1−1
@@ -489,7 +489,7 @@ static int pmc_setup_dev(struct pci_dev *pdev, const struct pci_device_id *ent) · 488 unmodified lines
489 pci_read_config_dword(pdev, PMC_BASE_ADDR_OFFSET, &pmc->base_addr);489 pci_read_config_dword(pdev, PMC_BASE_ADDR_OFFSET, &pmc->base_addr);
490 pmc->base_addr &= PMC_BASE_ADDR_MASK;490 pmc->base_addr &= PMC_BASE_ADDR_MASK;
491 491
492 pmc->regmap = ioremap_nocache(pmc->base_addr, PMC_MMIO_REG_LEN);492 pmc->regmap = ioremap(pmc->base_addr, PMC_MMIO_REG_LEN);
493 if (!pmc->regmap) {493 if (!pmc->regmap) {
494 dev_err(&pdev->dev, "error: ioremap failed\n");494 dev_err(&pdev->dev, "error: ioremap failed\n");
495 return -ENOMEM;495 return -ENOMEM;
drivers/platform/x86/samsung-laptop.c+2−2
@@ -1394,7 +1394,7 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung) · 1393 unmodified lines
1394 int ret = 0;1394 int ret = 0;
1395 int i;1395 int i;
1396 1396
1397 samsung->f0000_segment = ioremap_nocache(0xf0000, 0xffff);1397 samsung->f0000_segment = ioremap(0xf0000, 0xffff);
1398 if (!samsung->f0000_segment) {1398 if (!samsung->f0000_segment) {
1399 if (debug || force)1399 if (debug || force)
1400 pr_err("Can't map the segment at 0xf0000\n");1400 pr_err("Can't map the segment at 0xf0000\n");
@@ -1434,7 +1434,7 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung) · 33 unmodified lines
1434 if (debug)1434 if (debug)
1435 samsung_sabi_infos(samsung, loca, ifaceP);1435 samsung_sabi_infos(samsung, loca, ifaceP);
1436 1436
1437 samsung->sabi_iface = ioremap_nocache(ifaceP, 16);1437 samsung->sabi_iface = ioremap(ifaceP, 16);
1438 if (!samsung->sabi_iface) {1438 if (!samsung->sabi_iface) {
1439 pr_err("Can't remap %x\n", ifaceP);1439 pr_err("Can't remap %x\n", ifaceP);
1440 ret = -EINVAL;1440 ret = -EINVAL;
drivers/regulator/ti-abb-regulator.c+2−2
@@ -748,7 +748,7 @@ static int ti_abb_probe(struct platform_device *pdev) · 747 unmodified lines
748 * We may have shared interrupt register offsets which are748 * We may have shared interrupt register offsets which are
749 * write-1-to-clear between domains ensuring exclusivity.749 * write-1-to-clear between domains ensuring exclusivity.
750 */750 */
751 abb->int_base = devm_ioremap_nocache(dev, res->start,751 abb->int_base = devm_ioremap(dev, res->start,
752 resource_size(res));752 resource_size(res));
753 if (!abb->int_base) {753 if (!abb->int_base) {
754 dev_err(dev, "Unable to map '%s'\n", pname);754 dev_err(dev, "Unable to map '%s'\n", pname);
@@ -768,7 +768,7 @@ static int ti_abb_probe(struct platform_device *pdev) · 13 unmodified lines
768 * We may have shared efuse register offsets which are read-only768 * We may have shared efuse register offsets which are read-only
769 * between domains769 * between domains
770 */770 */
771 abb->efuse_base = devm_ioremap_nocache(dev, res->start,771 abb->efuse_base = devm_ioremap(dev, res->start,
772 resource_size(res));772 resource_size(res));
773 if (!abb->efuse_base) {773 if (!abb->efuse_base) {
774 dev_err(dev, "Unable to map '%s'\n", pname);774 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) · 503 unmodified lines
504 if (unlikely(!rtc->res))504 if (unlikely(!rtc->res))
505 return -EBUSY;505 return -EBUSY;
506 506
507 rtc->regbase = devm_ioremap_nocache(&pdev->dev, rtc->res->start,507 rtc->regbase = devm_ioremap(&pdev->dev, rtc->res->start,
508 rtc->regsize);508 rtc->regsize);
509 if (unlikely(!rtc->regbase))509 if (unlikely(!rtc->regbase))
510 return -EINVAL;510 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, · 292 unmodified lines
293 if (!request_mem_region(start, 0x1000, "aic79xx"))293 if (!request_mem_region(start, 0x1000, "aic79xx"))
294 error = ENOMEM;294 error = ENOMEM;
295 if (!error) {295 if (!error) {
296 *maddr = ioremap_nocache(base_page, base_offset + 512);296 *maddr = ioremap(base_page, base_offset + 512);
297 if (*maddr == NULL) {297 if (*maddr == NULL) {
298 error = ENOMEM;298 error = ENOMEM;
299 release_mem_region(start, 0x1000);299 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, · 371 unmodified lines
372 if (!request_mem_region(start, 0x1000, "aic7xxx"))372 if (!request_mem_region(start, 0x1000, "aic7xxx"))
373 error = ENOMEM;373 error = ENOMEM;
374 if (error == 0) {374 if (error == 0) {
375 *maddr = ioremap_nocache(start, 256);375 *maddr = ioremap(start, 256);
376 if (*maddr == NULL) {376 if (*maddr == NULL) {
377 error = ENOMEM;377 error = ENOMEM;
378 release_mem_region(start, 0x1000);378 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) · 269 unmodified lines
270 break;270 break;
271 }271 }
272 case ACB_ADAPTER_TYPE_C:{272 case ACB_ADAPTER_TYPE_C:{
273 acb->pmuC = ioremap_nocache(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));273 acb->pmuC = ioremap(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
274 if (!acb->pmuC) {274 if (!acb->pmuC) {
275 printk(KERN_NOTICE "arcmsr%d: memory mapping region fail \n", acb->host->host_no);275 printk(KERN_NOTICE "arcmsr%d: memory mapping region fail \n", acb->host->host_no);
276 return false;276 return false;
drivers/scsi/be2iscsi/be_main.c+3−3
@@ -453,14 +453,14 @@ static int beiscsi_map_pci_bars(struct beiscsi_hba *phba, · 452 unmodified lines
453 u8 __iomem *addr;453 u8 __iomem *addr;
454 int pcicfg_reg;454 int pcicfg_reg;
455 455
456 addr = ioremap_nocache(pci_resource_start(pcidev, 2),456 addr = ioremap(pci_resource_start(pcidev, 2),
457 pci_resource_len(pcidev, 2));457 pci_resource_len(pcidev, 2));
458 if (addr == NULL)458 if (addr == NULL)
459 return -ENOMEM;459 return -ENOMEM;
460 phba->ctrl.csr = addr;460 phba->ctrl.csr = addr;
461 phba->csr_va = addr;461 phba->csr_va = addr;
462 462
463 addr = ioremap_nocache(pci_resource_start(pcidev, 4), 128 * 1024);463 addr = ioremap(pci_resource_start(pcidev, 4), 128 * 1024);
464 if (addr == NULL)464 if (addr == NULL)
465 goto pci_map_err;465 goto pci_map_err;
466 phba->ctrl.db = addr;466 phba->ctrl.db = addr;
@@ -471,7 +471,7 @@ static int beiscsi_map_pci_bars(struct beiscsi_hba *phba, · 4 unmodified lines
471 else471 else
472 pcicfg_reg = 0;472 pcicfg_reg = 0;
473 473
474 addr = ioremap_nocache(pci_resource_start(pcidev, pcicfg_reg),474 addr = ioremap(pci_resource_start(pcidev, pcicfg_reg),
475 pci_resource_len(pcidev, pcicfg_reg));475 pci_resource_len(pcidev, pcicfg_reg));
476 476
477 if (addr == NULL)477 if (addr == NULL)
drivers/scsi/bnx2fc/bnx2fc_hwi.c+1−1
@@ -1414,7 +1414,7 @@ int bnx2fc_map_doorbell(struct bnx2fc_rport *tgt) · 1413 unmodified lines
1414 reg_base = pci_resource_start(hba->pcidev,1414 reg_base = pci_resource_start(hba->pcidev,
1415 BNX2X_DOORBELL_PCI_BAR);1415 BNX2X_DOORBELL_PCI_BAR);
1416 reg_off = (1 << BNX2X_DB_SHIFT) * (context_id & 0x1FFFF);1416 reg_off = (1 << BNX2X_DB_SHIFT) * (context_id & 0x1FFFF);
1417 tgt->ctx_base = ioremap_nocache(reg_base + reg_off, 4);1417 tgt->ctx_base = ioremap(reg_base + reg_off, 4);
1418 if (!tgt->ctx_base)1418 if (!tgt->ctx_base)
1419 return -ENOMEM;1419 return -ENOMEM;
1420 return 0;1420 return 0;
drivers/scsi/bnx2i/bnx2i_hwi.c+2−2
@@ -2715,7 +2715,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep) · 2714 unmodified lines
2715 reg_base = pci_resource_start(ep->hba->pcidev,2715 reg_base = pci_resource_start(ep->hba->pcidev,
2716 BNX2X_DOORBELL_PCI_BAR);2716 BNX2X_DOORBELL_PCI_BAR);
2717 reg_off = (1 << BNX2X_DB_SHIFT) * (cid_num & 0x1FFFF);2717 reg_off = (1 << BNX2X_DB_SHIFT) * (cid_num & 0x1FFFF);
2718 ep->qp.ctx_base = ioremap_nocache(reg_base + reg_off, 4);2718 ep->qp.ctx_base = ioremap(reg_base + reg_off, 4);
2719 if (!ep->qp.ctx_base)2719 if (!ep->qp.ctx_base)
2720 return -ENOMEM;2720 return -ENOMEM;
2721 goto arm_cq;2721 goto arm_cq;
@@ -2736,7 +2736,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep) · 14 unmodified lines
2736 /* 5709 device in normal node and 5706/5708 devices */2736 /* 5709 device in normal node and 5706/5708 devices */
2737 reg_off = CTX_OFFSET + (MB_KERNEL_CTX_SIZE * cid_num);2737 reg_off = CTX_OFFSET + (MB_KERNEL_CTX_SIZE * cid_num);
2738 2738
2739 ep->qp.ctx_base = ioremap_nocache(ep->hba->reg_base + reg_off,2739 ep->qp.ctx_base = ioremap(ep->hba->reg_base + reg_off,
2740 MB_KERNEL_CTX_SIZE);2740 MB_KERNEL_CTX_SIZE);
2741 if (!ep->qp.ctx_base)2741 if (!ep->qp.ctx_base)
2742 return -ENOMEM;2742 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) · 528 unmodified lines
529 goto err_free_hw;529 goto err_free_hw;
530 530
531 /* Get the start address of registers from BAR 0 */531 /* Get the start address of registers from BAR 0 */
532 hw->regstart = ioremap_nocache(pci_resource_start(pdev, 0),532 hw->regstart = ioremap(pci_resource_start(pdev, 0),
533 pci_resource_len(pdev, 0));533 pci_resource_len(pdev, 0));
534 if (!hw->regstart) {534 if (!hw->regstart) {
535 csio_err(hw, "Could not map BAR 0, regstart = %p\n",535 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) · 6875 unmodified lines
6876{6876{
6877 ulong page_base = ((ulong) base) & PAGE_MASK;6877 ulong page_base = ((ulong) base) & PAGE_MASK;
6878 ulong page_offs = ((ulong) base) - page_base;6878 ulong page_offs = ((ulong) base) - page_base;
6879 void __iomem *page_remapped = ioremap_nocache(page_base,6879 void __iomem *page_remapped = ioremap(page_base,
6880 page_offs + size);6880 page_offs + size);
6881 6881
6882 return page_remapped ? (page_remapped + page_offs) : NULL;6882 return page_remapped ? (page_remapped + page_offs) : NULL;
drivers/scsi/lasi700.c+1−1
@@ -98,7 +98,7 @@ lasi700_probe(struct parisc_device *dev) · 97 unmodified lines
98 98
99 hostdata->dev = &dev->dev;99 hostdata->dev = &dev->dev;
100 dma_set_mask(&dev->dev, DMA_BIT_MASK(32));100 dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
101 hostdata->base = ioremap_nocache(base, 0x100);101 hostdata->base = ioremap(base, 0x100);
102 hostdata->differential = 0;102 hostdata->differential = 0;
103 103
104 if (dev->id.sversion == LASI_700_SVERSION) {104 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) · 730 unmodified lines
731 goto out_free_raid_dev;731 goto out_free_raid_dev;
732 }732 }
733 733
734 raid_dev->baseaddr = ioremap_nocache(raid_dev->baseport, 128);734 raid_dev->baseaddr = ioremap(raid_dev->baseport, 128);
735 735
736 if (!raid_dev->baseaddr) {736 if (!raid_dev->baseaddr) {
737 737
drivers/scsi/megaraid/megaraid_sas_base.c+1−1
@@ -5875,7 +5875,7 @@ static int megasas_init_fw(struct megasas_instance *instance) · 5874 unmodified lines
5875 }5875 }
5876 5876
5877 base_addr = pci_resource_start(instance->pdev, instance->bar);5877 base_addr = pci_resource_start(instance->pdev, instance->bar);
5878 instance->reg_set = ioremap_nocache(base_addr, 8192);5878 instance->reg_set = ioremap(base_addr, 8192);
5879 5879
5880 if (!instance->reg_set) {5880 if (!instance->reg_set) {
5881 dev_printk(KERN_DEBUG, &instance->pdev->dev, "Failed to map IO mem\n");5881 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, · 3530 unmodified lines
3531 spin_lock_init(&cb->queue_lock);3531 spin_lock_init(&cb->queue_lock);
3532 if (mmio_size < PAGE_SIZE)3532 if (mmio_size < PAGE_SIZE)
3533 mmio_size = PAGE_SIZE;3533 mmio_size = PAGE_SIZE;
3534 cb->mmio_base = ioremap_nocache(cb->pci_addr & PAGE_MASK, mmio_size);3534 cb->mmio_base = ioremap(cb->pci_addr & PAGE_MASK, mmio_size);
3535 if (cb->mmio_base == NULL) {3535 if (cb->mmio_base == NULL) {
3536 dev_err(&pdev->dev,3536 dev_err(&pdev->dev,
3537 "Unable to map Controller Register Window\n");3537 "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, · 2310 unmodified lines
2311 /* Map the Controller Register Window. */2311 /* Map the Controller Register Window. */
2312 if (mmio_size < PAGE_SIZE)2312 if (mmio_size < PAGE_SIZE)
2313 mmio_size = PAGE_SIZE;2313 mmio_size = PAGE_SIZE;
2314 cs->mmio_base = ioremap_nocache(cs->pci_addr & PAGE_MASK, mmio_size);2314 cs->mmio_base = ioremap(cs->pci_addr & PAGE_MASK, mmio_size);
2315 if (cs->mmio_base == NULL) {2315 if (cs->mmio_base == NULL) {
2316 dev_err(&pdev->dev,2316 dev_err(&pdev->dev,
2317 "Unable to map Controller Register Window\n");2317 "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) · 1559 unmodified lines
1560 goto next_entry;1560 goto next_entry;
1561 1561
1562 data->MmioAddress = (unsigned long)1562 data->MmioAddress = (unsigned long)
1563 ioremap_nocache(p_dev->resource[2]->start,1563 ioremap(p_dev->resource[2]->start,
1564 resource_size(p_dev->resource[2]));1564 resource_size(p_dev->resource[2]));
1565 data->MmioLength = resource_size(p_dev->resource[2]);1565 data->MmioLength = resource_size(p_dev->resource[2]);
1566 }1566 }
drivers/scsi/qla2xxx/qla_mr.c+2−2
@@ -789,7 +789,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha) · 788 unmodified lines
789 }789 }
790 790
791 ha->cregbase =791 ha->cregbase =
792 ioremap_nocache(pci_resource_start(ha->pdev, 0), BAR0_LEN_FX00);792 ioremap(pci_resource_start(ha->pdev, 0), BAR0_LEN_FX00);
793 if (!ha->cregbase) {793 if (!ha->cregbase) {
794 ql_log_pci(ql_log_fatal, ha->pdev, 0x0128,794 ql_log_pci(ql_log_fatal, ha->pdev, 0x0128,
795 "cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));795 "cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));
@@ -810,7 +810,7 @@ qlafx00_iospace_config(struct qla_hw_data *ha) · 14 unmodified lines
810 }810 }
811 811
812 ha->iobase =812 ha->iobase =
813 ioremap_nocache(pci_resource_start(ha->pdev, 2), BAR2_LEN_FX00);813 ioremap(pci_resource_start(ha->pdev, 2), BAR2_LEN_FX00);
814 if (!ha->iobase) {814 if (!ha->iobase) {
815 ql_log_pci(ql_log_fatal, ha->pdev, 0x012b,815 ql_log_pci(ql_log_fatal, ha->pdev, 0x012b,
816 "cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));816 "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) · 7456 unmodified lines
7457 goto disable_device;7457 goto disable_device;
7458 }7458 }
7459 7459
7460 ctrl_info->iomem_base = ioremap_nocache(pci_resource_start(7460 ctrl_info->iomem_base = ioremap(pci_resource_start(
7461 ctrl_info->pci_dev, 0),7461 ctrl_info->pci_dev, 0),
7462 sizeof(struct pqi_ctrl_registers));7462 sizeof(struct pqi_ctrl_registers));
7463 if (!ctrl_info->iomem_base) {7463 if (!ctrl_info->iomem_base) {
drivers/scsi/sni_53c710.c+1−1
@@ -71,7 +71,7 @@ static int snirm710_probe(struct platform_device *dev) · 70 unmodified lines
71 71
72 hostdata->dev = &dev->dev;72 hostdata->dev = &dev->dev;
73 dma_set_mask(&dev->dev, DMA_BIT_MASK(32));73 dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
74 hostdata->base = ioremap_nocache(base, 0x100);74 hostdata->base = ioremap(base, 0x100);
75 hostdata->differential = 0;75 hostdata->differential = 0;
76 76
77 hostdata->clock = SNIRM710_CLOCK;77 hostdata->clock = SNIRM710_CLOCK;
drivers/scsi/sun3x_esp.c+2−2
@@ -190,7 +190,7 @@ static int esp_sun3x_probe(struct platform_device *dev) · 189 unmodified lines
190 if (!res || !res->start)190 if (!res || !res->start)
191 goto fail_unlink;191 goto fail_unlink;
192 192
193 esp->regs = ioremap_nocache(res->start, 0x20);193 esp->regs = ioremap(res->start, 0x20);
194 if (!esp->regs)194 if (!esp->regs)
195 goto fail_unmap_regs;195 goto fail_unmap_regs;
196 196
@@ -198,7 +198,7 @@ static int esp_sun3x_probe(struct platform_device *dev) · 1 unmodified line
198 if (!res || !res->start)198 if (!res || !res->start)
199 goto fail_unmap_regs;199 goto fail_unmap_regs;
200 200
201 esp->dma_regs = ioremap_nocache(res->start, 0x10);201 esp->dma_regs = ioremap(res->start, 0x10);
202 202
203 esp->command_block = dma_alloc_coherent(esp->dev, 16,203 esp->command_block = dma_alloc_coherent(esp->dev, 16,
204 &esp->command_block_dma,204 &esp->command_block_dma,
drivers/scsi/zalon.c+1−1
@@ -89,7 +89,7 @@ zalon_probe(struct parisc_device *dev) · 88 unmodified lines
89 struct gsc_irq gsc_irq;89 struct gsc_irq gsc_irq;
90 u32 zalon_vers;90 u32 zalon_vers;
91 int error = -ENODEV;91 int error = -ENODEV;
92 void __iomem *zalon = ioremap_nocache(dev->hpa.start, 4096);92 void __iomem *zalon = ioremap(dev->hpa.start, 4096);
93 void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET;93 void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET;
94 static int unit = 0;94 static int unit = 0;
95 struct Scsi_Host *host;95 struct Scsi_Host *host;
drivers/scsi/zorro_esp.c+3−3
@@ -801,7 +801,7 @@ static int zorro_esp_probe(struct zorro_dev *z, · 800 unmodified lines
801 /* additional setup required for Fastlane */801 /* additional setup required for Fastlane */
802 if (zep->zorro3 && ent->driver_data == ZORRO_BLZ1230II) {802 if (zep->zorro3 && ent->driver_data == ZORRO_BLZ1230II) {
803 /* map full address space up to ESP base for DMA */803 /* map full address space up to ESP base for DMA */
804 zep->board_base = ioremap_nocache(board,804 zep->board_base = ioremap(board,
805 FASTLANE_ESP_ADDR-1);805 FASTLANE_ESP_ADDR-1);
806 if (!zep->board_base) {806 if (!zep->board_base) {
807 pr_err("Cannot allocate board address space\n");807 pr_err("Cannot allocate board address space\n");
@@ -816,7 +816,7 @@ static int zorro_esp_probe(struct zorro_dev *z, · 8 unmodified lines
816 esp->ops = zdd->esp_ops;816 esp->ops = zdd->esp_ops;
817 817
818 if (ioaddr > 0xffffff)818 if (ioaddr > 0xffffff)
819 esp->regs = ioremap_nocache(ioaddr, 0x20);819 esp->regs = ioremap(ioaddr, 0x20);
820 else820 else
821 /* ZorroII address space remapped nocache by early startup */821 /* ZorroII address space remapped nocache by early startup */
822 esp->regs = ZTWO_VADDR(ioaddr);822 esp->regs = ZTWO_VADDR(ioaddr);
@@ -842,7 +842,7 @@ static int zorro_esp_probe(struct zorro_dev *z, · 19 unmodified lines
842 * Only Fastlane Z3 for now - add switch for correct struct842 * Only Fastlane Z3 for now - add switch for correct struct
843 * dma_registers size if adding any more843 * dma_registers size if adding any more
844 */844 */
845 esp->dma_regs = ioremap_nocache(dmaaddr,845 esp->dma_regs = ioremap(dmaaddr,
846 sizeof(struct fastlane_dma_registers));846 sizeof(struct fastlane_dma_registers));
847 } else847 } else
848 /* ZorroII address space remapped nocache by early startup */848 /* 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) · 367 unmodified lines
368 if (!mapping->base && mapping->phys) {368 if (!mapping->base && mapping->phys) {
369 kref_init(&mapping->ref);369 kref_init(&mapping->ref);
370 370
371 mapping->base = ioremap_nocache(mapping->phys, mapping->len);371 mapping->base = ioremap(mapping->phys, mapping->len);
372 if (unlikely(!mapping->base))372 if (unlikely(!mapping->base))
373 return -ENXIO;373 return -ENXIO;
374 } else if (mapping->base) {374 } else if (mapping->base) {
drivers/sh/intc/core.c+1−1
@@ -213,7 +213,7 @@ int __init register_intc_controller(struct intc_desc *desc) · 212 unmodified lines
213 WARN_ON(resource_type(res) != IORESOURCE_MEM);213 WARN_ON(resource_type(res) != IORESOURCE_MEM);
214 d->window[k].phys = res->start;214 d->window[k].phys = res->start;
215 d->window[k].size = resource_size(res);215 d->window[k].size = resource_size(res);
216 d->window[k].virt = ioremap_nocache(res->start,216 d->window[k].virt = ioremap(res->start,
217 resource_size(res));217 resource_size(res));
218 if (!d->window[k].virt)218 if (!d->window[k].virt)
219 goto err2;219 goto err2;
drivers/sh/intc/userimask.c+1−1
@@ -73,7 +73,7 @@ int register_intc_userimask(unsigned long addr) · 72 unmodified lines
73 if (unlikely(uimask))73 if (unlikely(uimask))
74 return -EBUSY;74 return -EBUSY;
75 75
76 uimask = ioremap_nocache(addr, SZ_4K);76 uimask = ioremap(addr, SZ_4K);
77 if (unlikely(!uimask))77 if (unlikely(!uimask))
78 return -ENOMEM;78 return -ENOMEM;
79 79
drivers/soc/tegra/flowctrl.c+1−1
@@ -219,7 +219,7 @@ static int __init tegra_flowctrl_init(void) · 218 unmodified lines
219 return 0;219 return 0;
220 }220 }
221 221
222 tegra_flowctrl_base = ioremap_nocache(res.start, resource_size(&res));222 tegra_flowctrl_base = ioremap(res.start, resource_size(&res));
223 if (!tegra_flowctrl_base)223 if (!tegra_flowctrl_base)
224 return -ENXIO;224 return -ENXIO;
225 225
drivers/soc/tegra/fuse/fuse-tegra.c+1−1
@@ -408,7 +408,7 @@ static int __init tegra_init_fuse(void) · 407 unmodified lines
408 }408 }
409 }409 }
410 410
411 fuse->base = ioremap_nocache(regs.start, resource_size(&regs));411 fuse->base = ioremap(regs.start, resource_size(&regs));
412 if (!fuse->base) {412 if (!fuse->base) {
413 pr_err("failed to map FUSE registers\n");413 pr_err("failed to map FUSE registers\n");
414 return -ENXIO;414 return -ENXIO;
drivers/soc/tegra/fuse/tegra-apbmisc.c+2−2
@@ -159,11 +159,11 @@ void __init tegra_init_apbmisc(void) · 158 unmodified lines
159 }159 }
160 }160 }
161 161
162 apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));162 apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
163 if (!apbmisc_base)163 if (!apbmisc_base)
164 pr_err("failed to map APBMISC registers\n");164 pr_err("failed to map APBMISC registers\n");
165 165
166 strapping_base = ioremap_nocache(straps.start, resource_size(&straps));166 strapping_base = ioremap(straps.start, resource_size(&straps));
167 if (!strapping_base)167 if (!strapping_base)
168 pr_err("failed to map strapping options registers\n");168 pr_err("failed to map strapping options registers\n");
169 169
drivers/soc/tegra/pmc.c+2−2
@@ -2826,7 +2826,7 @@ static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc, · 2825 unmodified lines
2826 2826
2827 of_address_to_resource(np, index, &regs);2827 of_address_to_resource(np, index, &regs);
2828 2828
2829 wake = ioremap_nocache(regs.start, resource_size(&regs));2829 wake = ioremap(regs.start, resource_size(&regs));
2830 if (!wake) {2830 if (!wake) {
2831 dev_err(pmc->dev, "failed to map PMC wake registers\n");2831 dev_err(pmc->dev, "failed to map PMC wake registers\n");
2832 return;2832 return;
@@ -3097,7 +3097,7 @@ static int __init tegra_pmc_early_init(void) · 264 unmodified lines
3097 }3097 }
3098 }3098 }
3099 3099
3100 pmc->base = ioremap_nocache(regs.start, resource_size(&regs));3100 pmc->base = ioremap(regs.start, resource_size(&regs));
3101 if (!pmc->base) {3101 if (!pmc->base) {
3102 pr_err("failed to map PMC registers\n");3102 pr_err("failed to map PMC registers\n");
3103 of_node_put(np);3103 of_node_put(np);
drivers/soc/xilinx/xlnx_vcu.c+2−2
@@ -511,7 +511,7 @@ static int xvcu_probe(struct platform_device *pdev) · 510 unmodified lines
511 return -ENODEV;511 return -ENODEV;
512 }512 }
513 513
514 xvcu->vcu_slcr_ba = devm_ioremap_nocache(&pdev->dev, res->start,514 xvcu->vcu_slcr_ba = devm_ioremap(&pdev->dev, res->start,
515 resource_size(res));515 resource_size(res));
516 if (!xvcu->vcu_slcr_ba) {516 if (!xvcu->vcu_slcr_ba) {
517 dev_err(&pdev->dev, "vcu_slcr register mapping failed.\n");517 dev_err(&pdev->dev, "vcu_slcr register mapping failed.\n");
@@ -524,7 +524,7 @@ static int xvcu_probe(struct platform_device *pdev) · 6 unmodified lines
524 return -ENODEV;524 return -ENODEV;
525 }525 }
526 526
527 xvcu->logicore_reg_ba = devm_ioremap_nocache(&pdev->dev, res->start,527 xvcu->logicore_reg_ba = devm_ioremap(&pdev->dev, res->start,
528 resource_size(res));528 resource_size(res));
529 if (!xvcu->logicore_reg_ba) {529 if (!xvcu->logicore_reg_ba) {
530 dev_err(&pdev->dev, "logicore register mapping failed.\n");530 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) · 300 unmodified lines
301 void __iomem *clk_reg;301 void __iomem *clk_reg;
302 u32 clk_cdiv;302 u32 clk_cdiv;
303 303
304 clk_reg = ioremap_nocache(MRST_CLK_SPI_REG, 16);304 clk_reg = ioremap(MRST_CLK_SPI_REG, 16);
305 if (!clk_reg)305 if (!clk_reg)
306 return -ENOMEM;306 return -ENOMEM;
307 307
drivers/spi/spi-jcore.c+1−1
@@ -170,7 +170,7 @@ static int jcore_spi_probe(struct platform_device *pdev) · 169 unmodified lines
170 if (!devm_request_mem_region(&pdev->dev, res->start,170 if (!devm_request_mem_region(&pdev->dev, res->start,
171 resource_size(res), pdev->name))171 resource_size(res), pdev->name))
172 goto exit_busy;172 goto exit_busy;
173 hw->base = devm_ioremap_nocache(&pdev->dev, res->start,173 hw->base = devm_ioremap(&pdev->dev, res->start,
174 resource_size(res));174 resource_size(res));
175 if (!hw->base)175 if (!hw->base)
176 goto exit_busy;176 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) · 602 unmodified lines
603 603
604 if (!chip->flash_region_mapped_ptr) {604 if (!chip->flash_region_mapped_ptr) {
605 chip->flash_region_mapped_ptr =605 chip->flash_region_mapped_ptr =
606 devm_ioremap_nocache(fiu->dev, (fiu->res_mem->start +606 devm_ioremap(fiu->dev, (fiu->res_mem->start +
607 (fiu->info->max_map_size *607 (fiu->info->max_map_size *
608 desc->mem->spi->chip_select)),608 desc->mem->spi->chip_select)),
609 (u32)desc->info.length);609 (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 *ports · 62 unmodified lines
63 for (i = 0; i < 2; i++) {63 for (i = 0; i < 2; i++) {
64 void __iomem *uart_regs;64 void __iomem *uart_regs;
65 65
66 uart_regs = ioremap_nocache(SSB_EUART, 16);66 uart_regs = ioremap(SSB_EUART, 16);
67 if (uart_regs) {67 if (uart_regs) {
68 uart_regs += (i * 8);68 uart_regs += (i * 8);
69 69
drivers/ssb/driver_pcicore.c+3−3
@@ -122,7 +122,7 @@ static int ssb_extpci_read_config(struct ssb_pcicore *pc, · 121 unmodified lines
122 if (unlikely(!addr))122 if (unlikely(!addr))
123 goto out;123 goto out;
124 err = -ENOMEM;124 err = -ENOMEM;
125 mmio = ioremap_nocache(addr, len);125 mmio = ioremap(addr, len);
126 if (!mmio)126 if (!mmio)
127 goto out;127 goto out;
128 128
@@ -168,7 +168,7 @@ static int ssb_extpci_write_config(struct ssb_pcicore *pc, · 39 unmodified lines
168 if (unlikely(!addr))168 if (unlikely(!addr))
169 goto out;169 goto out;
170 err = -ENOMEM;170 err = -ENOMEM;
171 mmio = ioremap_nocache(addr, len);171 mmio = ioremap(addr, len);
172 if (!mmio)172 if (!mmio)
173 goto out;173 goto out;
174 174
@@ -382,7 +382,7 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc) · 207 unmodified lines
382 /* Ok, ready to run, register it to the system.382 /* Ok, ready to run, register it to the system.
383 * The following needs change, if we want to port hostmode383 * The following needs change, if we want to port hostmode
384 * to non-MIPS platform. */384 * to non-MIPS platform. */
385 ssb_pcicore_controller.io_map_base = (unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000);385 ssb_pcicore_controller.io_map_base = (unsigned long)ioremap(SSB_PCI_MEM, 0x04000000);
386 set_io_port_base(ssb_pcicore_controller.io_map_base);386 set_io_port_base(ssb_pcicore_controller.io_map_base);
387 /* Give some time to the PCI controller to configure itself with the new387 /* Give some time to the PCI controller to configure itself with the new
388 * values. Not waiting at this point causes crashes of the machine. */388 * 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) · 302 unmodified lines
303 }303 }
304 304
305 gasket_dev->bar_data[bar_num].virt_base =305 gasket_dev->bar_data[bar_num].virt_base =
306 ioremap_nocache(gasket_dev->bar_data[bar_num].phys_base,306 ioremap(gasket_dev->bar_data[bar_num].phys_base,
307 gasket_dev->bar_data[bar_num].length_bytes);307 gasket_dev->bar_data[bar_num].length_bytes);
308 if (!gasket_dev->bar_data[bar_num].virt_base) {308 if (!gasket_dev->bar_data[bar_num].virt_base) {
309 dev_err(gasket_dev->dev,309 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, · 337 unmodified lines
338 reg_bar_phys_addr = pci_resource_start(pcard->pdev, REG_BAR);338 reg_bar_phys_addr = pci_resource_start(pcard->pdev, REG_BAR);
339 reg_bar_phys_len = pci_resource_len(pcard->pdev, REG_BAR);339 reg_bar_phys_len = pci_resource_len(pcard->pdev, REG_BAR);
340 340
341 pcard->regs_bar_base = ioremap_nocache(reg_bar_phys_addr, PAGE_SIZE);341 pcard->regs_bar_base = ioremap(reg_bar_phys_addr, PAGE_SIZE);
342 if (!pcard->regs_bar_base) {342 if (!pcard->regs_bar_base) {
343 dev_err(&pcard->pdev->dev,343 dev_err(&pcard->pdev->dev,
344 "probe: REG_BAR could not remap memory to virtual space\n");344 "probe: REG_BAR could not remap memory to virtual space\n");
@@ -367,7 +367,7 @@ static int kp2000_pcie_probe(struct pci_dev *pdev, · 22 unmodified lines
367 dma_bar_phys_addr = pci_resource_start(pcard->pdev, DMA_BAR);367 dma_bar_phys_addr = pci_resource_start(pcard->pdev, DMA_BAR);
368 dma_bar_phys_len = pci_resource_len(pcard->pdev, DMA_BAR);368 dma_bar_phys_len = pci_resource_len(pcard->pdev, DMA_BAR);
369 369
370 pcard->dma_bar_base = ioremap_nocache(dma_bar_phys_addr,370 pcard->dma_bar_base = ioremap(dma_bar_phys_addr,
371 dma_bar_phys_len);371 dma_bar_phys_len);
372 if (!pcard->dma_bar_base) {372 if (!pcard->dma_bar_base) {
373 dev_err(&pcard->pdev->dev,373 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) · 658 unmodified lines
659 if (!res)659 if (!res)
660 return -ENXIO;660 return -ENXIO;
661 661
662 priv->smba = (unsigned long)devm_ioremap_nocache(&pldev->dev,662 priv->smba = (unsigned long)devm_ioremap(&pldev->dev,
663 res->start,663 res->start,
664 resource_size(res));664 resource_size(res));
665 if (!priv->smba)665 if (!priv->smba)
drivers/staging/kpc2000/kpc2000_spi.c+1−1
@@ -464,7 +464,7 @@ kp_spi_probe(struct platform_device *pldev) · 463 unmodified lines
464 goto free_master;464 goto free_master;
465 }465 }
466 466
467 kpspi->base = devm_ioremap_nocache(&pldev->dev, r->start,467 kpspi->base = devm_ioremap(&pldev->dev, r->start,
468 resource_size(r));468 resource_size(r));
469 469
470 status = spi_register_master(master);470 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) · 121 unmodified lines
122 rv = -ENXIO;122 rv = -ENXIO;
123 goto err_kfree;123 goto err_kfree;
124 }124 }
125 ldev->eng_regs = ioremap_nocache(r->start, resource_size(r));125 ldev->eng_regs = ioremap(r->start, resource_size(r));
126 if (!ldev->eng_regs) {126 if (!ldev->eng_regs) {
127 dev_err(&ldev->pldev->dev, "%s: failed to ioremap engine regs!\n", __func__);127 dev_err(&ldev->pldev->dev, "%s: failed to ioremap engine regs!\n", __func__);
128 rv = -ENXIO;128 rv = -ENXIO;
drivers/staging/media/allegro-dvt/allegro-core.c+2−2
@@ -2914,7 +2914,7 @@ static int allegro_probe(struct platform_device *pdev) · 2913 unmodified lines
2914 "regs resource missing from device tree\n");2914 "regs resource missing from device tree\n");
2915 return -EINVAL;2915 return -EINVAL;
2916 }2916 }
2917 regs = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res));2917 regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
2918 if (IS_ERR(regs)) {2918 if (IS_ERR(regs)) {
2919 dev_err(&pdev->dev, "failed to map registers\n");2919 dev_err(&pdev->dev, "failed to map registers\n");
2920 return PTR_ERR(regs);2920 return PTR_ERR(regs);
@@ -2932,7 +2932,7 @@ static int allegro_probe(struct platform_device *pdev) · 11 unmodified lines
2932 "sram resource missing from device tree\n");2932 "sram resource missing from device tree\n");
2933 return -EINVAL;2933 return -EINVAL;
2934 }2934 }
2935 sram_regs = devm_ioremap_nocache(&pdev->dev,2935 sram_regs = devm_ioremap(&pdev->dev,
2936 sram_res->start,2936 sram_res->start,
2937 resource_size(sram_res));2937 resource_size(sram_res));
2938 if (IS_ERR(sram_regs)) {2938 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, · 4454 unmodified lines
4455 pdev->needs_freset = 1;4455 pdev->needs_freset = 1;
4456 pci_save_state(pdev);4456 pci_save_state(pdev);
4457 qdev->reg_base =4457 qdev->reg_base =
4458 ioremap_nocache(pci_resource_start(pdev, 1),4458 ioremap(pci_resource_start(pdev, 1),
4459 pci_resource_len(pdev, 1));4459 pci_resource_len(pdev, 1));
4460 if (!qdev->reg_base) {4460 if (!qdev->reg_base) {
4461 dev_err(&pdev->dev, "Register mapping failed.\n");4461 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, · 3 unmodified lines
4465 4465
4466 qdev->doorbell_area_size = pci_resource_len(pdev, 3);4466 qdev->doorbell_area_size = pci_resource_len(pdev, 3);
4467 qdev->doorbell_area =4467 qdev->doorbell_area =
4468 ioremap_nocache(pci_resource_start(pdev, 3),4468 ioremap(pci_resource_start(pdev, 3),
4469 pci_resource_len(pdev, 3));4469 pci_resource_len(pdev, 3));
4470 if (!qdev->doorbell_area) {4470 if (!qdev->doorbell_area) {
4471 dev_err(&pdev->dev, "Doorbell register mapping failed.\n");4471 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, · 2462 unmodified lines
2463 }2463 }
2464 2464
2465 2465
2466 ioaddr = (unsigned long)ioremap_nocache(pmem_start, pmem_len);2466 ioaddr = (unsigned long)ioremap(pmem_start, pmem_len);
2467 if (ioaddr == (unsigned long)NULL) {2467 if (ioaddr == (unsigned long)NULL) {
2468 netdev_err(dev, "ioremap failed!");2468 netdev_err(dev, "ioremap failed!");
2469 goto err_rel_mem;2469 goto err_rel_mem;
drivers/staging/rts5208/rtsx.c+1−1
@@ -858,7 +858,7 @@ static int rtsx_probe(struct pci_dev *pci, · 857 unmodified lines
858 dev_info(&pci->dev, "Resource length: 0x%x\n",858 dev_info(&pci->dev, "Resource length: 0x%x\n",
859 (unsigned int)pci_resource_len(pci, 0));859 (unsigned int)pci_resource_len(pci, 0));
860 dev->addr = pci_resource_start(pci, 0);860 dev->addr = pci_resource_start(pci, 0);
861 dev->remap_addr = ioremap_nocache(dev->addr, pci_resource_len(pci, 0));861 dev->remap_addr = ioremap(dev->addr, pci_resource_len(pci, 0));
862 if (!dev->remap_addr) {862 if (!dev->remap_addr) {
863 dev_err(&pci->dev, "ioremap error\n");863 dev_err(&pci->dev, "ioremap error\n");
864 err = -ENXIO;864 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) · 49 unmodified lines
50 }50 }
51 51
52 /* now map mmio and vidmem */52 /* now map mmio and vidmem */
53 sm750_dev->pvReg = ioremap_nocache(sm750_dev->vidreg_start,53 sm750_dev->pvReg = ioremap(sm750_dev->vidreg_start,
54 sm750_dev->vidreg_size);54 sm750_dev->vidreg_size);
55 if (!sm750_dev->pvReg) {55 if (!sm750_dev->pvReg) {
56 pr_err("mmio failed\n");56 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) · 215 unmodified lines
216 goto error_request_region;216 goto error_request_region;
217 }217 }
218 218
219 whcrc->rc_base = ioremap_nocache(whcrc->area, whcrc->rc_len);219 whcrc->rc_base = ioremap(whcrc->area, whcrc->rc_len);
220 if (whcrc->rc_base == NULL) {220 if (whcrc->rc_base == NULL) {
221 dev_err(dev, "can't ioremap registers (%zu bytes @ 0x%lx): %d\n",221 dev_err(dev, "can't ioremap registers (%zu bytes @ 0x%lx): %d\n",
222 whcrc->rc_len, whcrc->area, result);222 whcrc->rc_len, whcrc->area, result);
223 goto error_ioremap_nocache;223 goto error_ioremap;
224 }224 }
225 225
226 result = request_irq(umc_dev->irq, whcrc_irq_cb, IRQF_SHARED,226 result = request_irq(umc_dev->irq, whcrc_irq_cb, IRQF_SHARED,
@@ -254,7 +254,7 @@ error_cmd_buffer: · 27 unmodified lines
254 free_irq(umc_dev->irq, whcrc);254 free_irq(umc_dev->irq, whcrc);
255error_request_irq:255error_request_irq:
256 iounmap(whcrc->rc_base);256 iounmap(whcrc->rc_base);
257error_ioremap_nocache:257error_ioremap:
258 release_mem_region(whcrc->area, whcrc->rc_len);258 release_mem_region(whcrc->area, whcrc->rc_len);
259error_request_region:259error_request_region:
260 return result;260 return result;
drivers/tc/tc.c+1−1
@@ -47,7 +47,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus) · 46 unmodified lines
47 for (slot = 0; slot < tbus->num_tcslots; slot++) {47 for (slot = 0; slot < tbus->num_tcslots; slot++) {
48 slotaddr = tbus->slot_base + slot * slotsize;48 slotaddr = tbus->slot_base + slot * slotsize;
49 extslotaddr = tbus->ext_slot_base + slot * extslotsize;49 extslotaddr = tbus->ext_slot_base + slot * extslotsize;
50 module = ioremap_nocache(slotaddr, slotsize);50 module = ioremap(slotaddr, slotsize);
51 BUG_ON(!module);51 BUG_ON(!module);
52 52
53 offset = TC_OLDCARD;53 offset = TC_OLDCARD;
drivers/tty/cyclades.c+5−5
@@ -3256,7 +3256,7 @@ static int __init cy_detect_isa(void) · 3255 unmodified lines
3256 return nboard;3256 return nboard;
3257 3257
3258 /* probe for CD1400... */3258 /* probe for CD1400... */
3259 cy_isa_address = ioremap_nocache(isa_address, CyISA_Ywin);3259 cy_isa_address = ioremap(isa_address, CyISA_Ywin);
3260 if (cy_isa_address == NULL) {3260 if (cy_isa_address == NULL) {
3261 printk(KERN_ERR "Cyclom-Y/ISA: can't remap base "3261 printk(KERN_ERR "Cyclom-Y/ISA: can't remap base "
3262 "address\n");3262 "address\n");
@@ -3690,13 +3690,13 @@ static int cy_pci_probe(struct pci_dev *pdev, · 427 unmodified lines
3690 device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {3690 device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
3691 card_name = "Cyclom-Y";3691 card_name = "Cyclom-Y";
3692 3692
3693 addr0 = ioremap_nocache(pci_resource_start(pdev, 0),3693 addr0 = ioremap(pci_resource_start(pdev, 0),
3694 CyPCI_Yctl);3694 CyPCI_Yctl);
3695 if (addr0 == NULL) {3695 if (addr0 == NULL) {
3696 dev_err(&pdev->dev, "can't remap ctl region\n");3696 dev_err(&pdev->dev, "can't remap ctl region\n");
3697 goto err_reg;3697 goto err_reg;
3698 }3698 }
3699 addr2 = ioremap_nocache(pci_resource_start(pdev, 2),3699 addr2 = ioremap(pci_resource_start(pdev, 2),
3700 CyPCI_Ywin);3700 CyPCI_Ywin);
3701 if (addr2 == NULL) {3701 if (addr2 == NULL) {
3702 dev_err(&pdev->dev, "can't remap base region\n");3702 dev_err(&pdev->dev, "can't remap base region\n");
@@ -3712,7 +3712,7 @@ static int cy_pci_probe(struct pci_dev *pdev, · 9 unmodified lines
3712 } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {3712 } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
3713 struct RUNTIME_9060 __iomem *ctl_addr;3713 struct RUNTIME_9060 __iomem *ctl_addr;
3714 3714
3715 ctl_addr = addr0 = ioremap_nocache(pci_resource_start(pdev, 0),3715 ctl_addr = addr0 = ioremap(pci_resource_start(pdev, 0),
3716 CyPCI_Zctl);3716 CyPCI_Zctl);
3717 if (addr0 == NULL) {3717 if (addr0 == NULL) {
3718 dev_err(&pdev->dev, "can't remap ctl region\n");3718 dev_err(&pdev->dev, "can't remap ctl region\n");
@@ -3727,7 +3727,7 @@ static int cy_pci_probe(struct pci_dev *pdev, · 8 unmodified lines
3727 3727
3728 mailbox = readl(&ctl_addr->mail_box_0);3728 mailbox = readl(&ctl_addr->mail_box_0);
3729 3729
3730 addr2 = ioremap_nocache(pci_resource_start(pdev, 2),3730 addr2 = ioremap(pci_resource_start(pdev, 2),
3731 mailbox == ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);3731 mailbox == ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);
3732 if (addr2 == NULL) {3732 if (addr2 == NULL) {
3733 dev_err(&pdev->dev, "can't remap base region\n");3733 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) · 897 unmodified lines
898 atomic_set(&priv->xmit_total, 0);898 atomic_set(&priv->xmit_total, 0);
899 raw_spin_lock_init(&priv->lock);899 raw_spin_lock_init(&priv->lock);
900 900
901 priv->reg = devm_ioremap_nocache(priv->dev, dev->res.start,901 priv->reg = devm_ioremap(priv->dev, dev->res.start,
902 resource_size(&dev->res));902 resource_size(&dev->res));
903 if (!priv->reg) {903 if (!priv->reg) {
904 dev_err(priv->dev, "ioremap failed for resource %pR\n",904 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, · 960 unmodified lines
961 goto err;961 goto err;
962 }962 }
963 963
964 board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);964 board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000);
965 if (board->basemem == NULL) {965 if (board->basemem == NULL) {
966 dev_err(&pdev->dev, "can't remap io space 2\n");966 dev_err(&pdev->dev, "can't remap io space 2\n");
967 retval = -ENOMEM;967 retval = -ENOMEM;
@@ -1071,7 +1071,7 @@ static int __init moxa_init(void) · 103 unmodified lines
1071 brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :1071 brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :
1072 numports[i];1072 numports[i];
1073 brd->busType = MOXA_BUS_TYPE_ISA;1073 brd->busType = MOXA_BUS_TYPE_ISA;
1074 brd->basemem = ioremap_nocache(baseaddr[i], 0x4000);1074 brd->basemem = ioremap(baseaddr[i], 0x4000);
1075 if (!brd->basemem) {1075 if (!brd->basemem) {
1076 printk(KERN_ERR "MOXA: can't remap %lx\n",1076 printk(KERN_ERR "MOXA: can't remap %lx\n",
1077 baseaddr[i]);1077 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) · 54 unmodified lines
55 uart.port.uartclk = (dev->id.sversion != 0xad) ?55 uart.port.uartclk = (dev->id.sversion != 0xad) ?
56 7272727 : 1843200;56 7272727 : 1843200;
57 uart.port.mapbase = address;57 uart.port.mapbase = address;
58 uart.port.membase = ioremap_nocache(address, 16);58 uart.port.membase = ioremap(address, 16);
59 if (!uart.port.membase) {59 if (!uart.port.membase) {
60 dev_warn(&dev->dev, "Failed to map memory\n");60 dev_warn(&dev->dev, "Failed to map memory\n");
61 return -ENOMEM;61 return -ENOMEM;
drivers/tty/serial/8250/8250_omap.c+1−1
@@ -1147,7 +1147,7 @@ static int omap8250_probe(struct platform_device *pdev) · 1146 unmodified lines
1147 if (!priv)1147 if (!priv)
1148 return -ENOMEM;1148 return -ENOMEM;
1149 1149
1150 membase = devm_ioremap_nocache(&pdev->dev, regs->start,1150 membase = devm_ioremap(&pdev->dev, regs->start,
1151 resource_size(regs));1151 resource_size(regs));
1152 if (!membase)1152 if (!membase)
1153 return -ENODEV;1153 return -ENODEV;
drivers/tty/serial/8250/8250_pci.c+3−3
@@ -275,7 +275,7 @@ static int pci_plx9050_init(struct pci_dev *dev) · 274 unmodified lines
275 /*275 /*
276 * enable/disable interrupts276 * enable/disable interrupts
277 */277 */
278 p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);278 p = ioremap(pci_resource_start(dev, 0), 0x80);
279 if (p == NULL)279 if (p == NULL)
280 return -ENOMEM;280 return -ENOMEM;
281 writel(irq_config, p + 0x4c);281 writel(irq_config, p + 0x4c);
@@ -299,7 +299,7 @@ static void pci_plx9050_exit(struct pci_dev *dev) · 17 unmodified lines
299 /*299 /*
300 * disable interrupts300 * disable interrupts
301 */301 */
302 p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);302 p = ioremap(pci_resource_start(dev, 0), 0x80);
303 if (p != NULL) {303 if (p != NULL) {
304 writel(0, p + 0x4c);304 writel(0, p + 0x4c);
305 305
@@ -475,7 +475,7 @@ static int pci_siig10x_init(struct pci_dev *dev) · 169 unmodified lines
475 break;475 break;
476 }476 }
477 477
478 p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);478 p = ioremap(pci_resource_start(dev, 0), 0x80);
479 if (p == NULL)479 if (p == NULL)
480 return -ENOMEM;480 return -ENOMEM;
481 481
drivers/tty/serial/8250/8250_port.c+1−1
@@ -2766,7 +2766,7 @@ static int serial8250_request_std_resource(struct uart_8250_port *up) · 2765 unmodified lines
2766 }2766 }
2767 2767
2768 if (port->flags & UPF_IOREMAP) {2768 if (port->flags & UPF_IOREMAP) {
2769 port->membase = ioremap_nocache(port->mapbase, size);2769 port->membase = ioremap(port->mapbase, size);
2770 if (!port->membase) {2770 if (!port->membase) {
2771 release_mem_region(port->mapbase, size);2771 release_mem_region(port->mapbase, size);
2772 ret = -ENOMEM;2772 ret = -ENOMEM;
drivers/tty/serial/dz.c+1−1
@@ -677,7 +677,7 @@ static void dz_release_port(struct uart_port *uport) · 676 unmodified lines
677static int dz_map_port(struct uart_port *uport)677static int dz_map_port(struct uart_port *uport)
678{678{
679 if (!uport->membase)679 if (!uport->membase)
680 uport->membase = ioremap_nocache(uport->mapbase,680 uport->membase = ioremap(uport->mapbase,
681 dec_kn_slot_size);681 dec_kn_slot_size);
682 if (!uport->membase) {682 if (!uport->membase) {
683 printk(KERN_ERR "dz: Cannot map MMIO\n");683 printk(KERN_ERR "dz: Cannot map MMIO\n");
drivers/tty/serial/lantiq.c+1−1
@@ -549,7 +549,7 @@ lqasc_request_port(struct uart_port *port) · 548 unmodified lines
549 }549 }
550 550
551 if (port->flags & UPF_IOREMAP) {551 if (port->flags & UPF_IOREMAP) {
552 port->membase = devm_ioremap_nocache(&pdev->dev,552 port->membase = devm_ioremap(&pdev->dev,
553 port->mapbase, size);553 port->mapbase, size);
554 if (port->membase == NULL)554 if (port->membase == NULL)
555 return -ENOMEM;555 return -ENOMEM;
drivers/tty/serial/meson_uart.c+1−1
@@ -411,7 +411,7 @@ static int meson_uart_request_port(struct uart_port *port) · 410 unmodified lines
411 return -EBUSY;411 return -EBUSY;
412 }412 }
413 413
414 port->membase = devm_ioremap_nocache(port->dev, port->mapbase,414 port->membase = devm_ioremap(port->dev, port->mapbase,
415 port->mapsize);415 port->mapsize);
416 if (!port->membase)416 if (!port->membase)
417 return -ENOMEM;417 return -ENOMEM;
drivers/tty/serial/mux.c+1−1
@@ -474,7 +474,7 @@ static int __init mux_probe(struct parisc_device *dev) · 473 unmodified lines
474 port->iobase = 0;474 port->iobase = 0;
475 port->mapbase = dev->hpa.start + MUX_OFFSET +475 port->mapbase = dev->hpa.start + MUX_OFFSET +
476 (i * MUX_LINE_OFFSET);476 (i * MUX_LINE_OFFSET);
477 port->membase = ioremap_nocache(port->mapbase, MUX_LINE_OFFSET);477 port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET);
478 port->iotype = UPIO_MEM;478 port->iotype = UPIO_MEM;
479 port->type = PORT_MUX;479 port->type = PORT_MUX;
480 port->irq = 0;480 port->irq = 0;
drivers/tty/serial/owl-uart.c+1−1
@@ -427,7 +427,7 @@ static int owl_uart_request_port(struct uart_port *port) · 426 unmodified lines
427 return -EBUSY;427 return -EBUSY;
428 428
429 if (port->flags & UPF_IOREMAP) {429 if (port->flags & UPF_IOREMAP) {
430 port->membase = devm_ioremap_nocache(port->dev, port->mapbase,430 port->membase = devm_ioremap(port->dev, port->mapbase,
431 resource_size(res));431 resource_size(res));
432 if (!port->membase)432 if (!port->membase)
433 return -EBUSY;433 return -EBUSY;
drivers/tty/serial/pic32_uart.c+1−1
@@ -618,7 +618,7 @@ static int pic32_uart_request_port(struct uart_port *port) · 617 unmodified lines
618 "pic32_uart_mem"))618 "pic32_uart_mem"))
619 return -EBUSY;619 return -EBUSY;
620 620
621 port->membase = devm_ioremap_nocache(port->dev, port->mapbase,621 port->membase = devm_ioremap(port->dev, port->mapbase,
622 resource_size(res_mem));622 resource_size(res_mem));
623 if (!port->membase) {623 if (!port->membase) {
624 dev_err(port->dev, "Unable to map registers\n");624 dev_err(port->dev, "Unable to map registers\n");
drivers/tty/serial/rda-uart.c+1−1
@@ -498,7 +498,7 @@ static int rda_uart_request_port(struct uart_port *port) · 497 unmodified lines
498 return -EBUSY;498 return -EBUSY;
499 499
500 if (port->flags & UPF_IOREMAP) {500 if (port->flags & UPF_IOREMAP) {
501 port->membase = devm_ioremap_nocache(port->dev, port->mapbase,501 port->membase = devm_ioremap(port->dev, port->mapbase,
502 resource_size(res));502 resource_size(res));
503 if (!port->membase)503 if (!port->membase)
504 return -EBUSY;504 return -EBUSY;
drivers/tty/serial/sb1250-duart.c+2−2
@@ -668,7 +668,7 @@ static int sbd_map_port(struct uart_port *uport) · 667 unmodified lines
668 struct sbd_duart *duart = sport->duart;668 struct sbd_duart *duart = sport->duart;
669 669
670 if (!uport->membase)670 if (!uport->membase)
671 uport->membase = ioremap_nocache(uport->mapbase,671 uport->membase = ioremap(uport->mapbase,
672 DUART_CHANREG_SPACING);672 DUART_CHANREG_SPACING);
673 if (!uport->membase) {673 if (!uport->membase) {
674 printk(err);674 printk(err);
@@ -676,7 +676,7 @@ static int sbd_map_port(struct uart_port *uport) · 1 unmodified line
676 }676 }
677 677
678 if (!sport->memctrl)678 if (!sport->memctrl)
679 sport->memctrl = ioremap_nocache(duart->mapctrl,679 sport->memctrl = ioremap(duart->mapctrl,
680 DUART_CHANREG_SPACING);680 DUART_CHANREG_SPACING);
681 if (!sport->memctrl) {681 if (!sport->memctrl) {
682 printk(err);682 printk(err);
drivers/tty/serial/sh-sci.c+1−1
@@ -2680,7 +2680,7 @@ static int sci_remap_port(struct uart_port *port) · 2679 unmodified lines
2680 return 0;2680 return 0;
2681 2681
2682 if (port->dev->of_node || (port->flags & UPF_IOREMAP)) {2682 if (port->dev->of_node || (port->flags & UPF_IOREMAP)) {
2683 port->membase = ioremap_nocache(port->mapbase, sport->reg_size);2683 port->membase = ioremap(port->mapbase, sport->reg_size);
2684 if (unlikely(!port->membase)) {2684 if (unlikely(!port->membase)) {
2685 dev_err(port->dev, "can't remap port#%d\n", port->line);2685 dev_err(port->dev, "can't remap port#%d\n", port->line);
2686 return -ENXIO;2686 return -ENXIO;
drivers/tty/serial/zs.c+1−1
@@ -992,7 +992,7 @@ static void zs_release_port(struct uart_port *uport) · 991 unmodified lines
992static int zs_map_port(struct uart_port *uport)992static int zs_map_port(struct uart_port *uport)
993{993{
994 if (!uport->membase)994 if (!uport->membase)
995 uport->membase = ioremap_nocache(uport->mapbase,995 uport->membase = ioremap(uport->mapbase,
996 ZS_CHAN_IO_SIZE);996 ZS_CHAN_IO_SIZE);
997 if (!uport->membase) {997 if (!uport->membase) {
998 printk(KERN_ERR "zs: Cannot map MMIO\n");998 printk(KERN_ERR "zs: Cannot map MMIO\n");
drivers/tty/synclink.c+2−2
@@ -4054,7 +4054,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info) · 4053 unmodified lines
4054 }4054 }
4055 info->lcr_mem_requested = true;4055 info->lcr_mem_requested = true;
4056 4056
4057 info->memory_base = ioremap_nocache(info->phys_memory_base,4057 info->memory_base = ioremap(info->phys_memory_base,
4058 0x40000);4058 0x40000);
4059 if (!info->memory_base) {4059 if (!info->memory_base) {
4060 printk( "%s(%d):Can't map shared memory on device %s MemAddr=%08X\n",4060 printk( "%s(%d):Can't map shared memory on device %s MemAddr=%08X\n",
@@ -4068,7 +4068,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info) · 7 unmodified lines
4068 goto errout;4068 goto errout;
4069 }4069 }
4070 4070
4071 info->lcr_base = ioremap_nocache(info->phys_lcr_base,4071 info->lcr_base = ioremap(info->phys_lcr_base,
4072 PAGE_SIZE);4072 PAGE_SIZE);
4073 if (!info->lcr_base) {4073 if (!info->lcr_base) {
4074 printk( "%s(%d):Can't map LCR memory on device %s MemAddr=%08X\n",4074 printk( "%s(%d):Can't map LCR memory on device %s MemAddr=%08X\n",
drivers/tty/synclink_gt.c+1−1
@@ -3450,7 +3450,7 @@ static int claim_resources(struct slgt_info *info) · 3449 unmodified lines
3450 else3450 else
3451 info->reg_addr_requested = true;3451 info->reg_addr_requested = true;
3452 3452
3453 info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);3453 info->reg_addr = ioremap(info->phys_reg_addr, SLGT_REG_SIZE);
3454 if (!info->reg_addr) {3454 if (!info->reg_addr) {
3455 DBGERR(("%s can't map device registers, addr=%08X\n",3455 DBGERR(("%s can't map device registers, addr=%08X\n",
3456 info->device_name, info->phys_reg_addr));3456 info->device_name, info->phys_reg_addr));
drivers/tty/synclinkmp.c+4−4
@@ -3559,7 +3559,7 @@ static int claim_resources(SLMP_INFO *info) · 3558 unmodified lines
3559 else3559 else
3560 info->sca_statctrl_requested = true;3560 info->sca_statctrl_requested = true;
3561 3561
3562 info->memory_base = ioremap_nocache(info->phys_memory_base,3562 info->memory_base = ioremap(info->phys_memory_base,
3563 SCA_MEM_SIZE);3563 SCA_MEM_SIZE);
3564 if (!info->memory_base) {3564 if (!info->memory_base) {
3565 printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n",3565 printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n",
@@ -3568,7 +3568,7 @@ static int claim_resources(SLMP_INFO *info) · 2 unmodified lines
3568 goto errout;3568 goto errout;
3569 }3569 }
3570 3570
3571 info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);3571 info->lcr_base = ioremap(info->phys_lcr_base, PAGE_SIZE);
3572 if (!info->lcr_base) {3572 if (!info->lcr_base) {
3573 printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n",3573 printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n",
3574 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );3574 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
@@ -3577,7 +3577,7 @@ static int claim_resources(SLMP_INFO *info) · 2 unmodified lines
3577 }3577 }
3578 info->lcr_base += info->lcr_offset;3578 info->lcr_base += info->lcr_offset;
3579 3579
3580 info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);3580 info->sca_base = ioremap(info->phys_sca_base, PAGE_SIZE);
3581 if (!info->sca_base) {3581 if (!info->sca_base) {
3582 printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n",3582 printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n",
3583 __FILE__,__LINE__,info->device_name, info->phys_sca_base );3583 __FILE__,__LINE__,info->device_name, info->phys_sca_base );
@@ -3586,7 +3586,7 @@ static int claim_resources(SLMP_INFO *info) · 2 unmodified lines
3586 }3586 }
3587 info->sca_base += info->sca_offset;3587 info->sca_base += info->sca_offset;
3588 3588
3589 info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,3589 info->statctrl_base = ioremap(info->phys_statctrl_base,
3590 PAGE_SIZE);3590 PAGE_SIZE);
3591 if (!info->statctrl_base) {3591 if (!info->statctrl_base) {
3592 printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n",3592 printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n",
drivers/usb/core/hcd-pci.c+1−1
@@ -222,7 +222,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) · 221 unmodified lines
222 retval = -EBUSY;222 retval = -EBUSY;
223 goto put_hcd;223 goto put_hcd;
224 }224 }
225 hcd->regs = devm_ioremap_nocache(&dev->dev, hcd->rsrc_start,225 hcd->regs = devm_ioremap(&dev->dev, hcd->rsrc_start,
226 hcd->rsrc_len);226 hcd->rsrc_len);
227 if (hcd->regs == NULL) {227 if (hcd->regs == NULL) {
228 dev_dbg(&dev->dev, "error mapping memory\n");228 dev_dbg(&dev->dev, "error mapping memory\n");
drivers/usb/early/xhci-dbc.c+1−1
@@ -971,7 +971,7 @@ static int __init xdbc_init(void) · 970 unmodified lines
971 goto free_and_quit;971 goto free_and_quit;
972 }972 }
973 973
974 base = ioremap_nocache(xdbc.xhci_start, xdbc.xhci_length);974 base = ioremap(xdbc.xhci_start, xdbc.xhci_length);
975 if (!base) {975 if (!base) {
976 xdbc_trace("failed to remap the io address\n");976 xdbc_trace("failed to remap the io address\n");
977 ret = -ENOMEM;977 ret = -ENOMEM;
drivers/usb/gadget/udc/amd5536udc_pci.c+1−1
@@ -116,7 +116,7 @@ static int udc_pci_probe( · 115 unmodified lines
116 goto err_memreg;116 goto err_memreg;
117 }117 }
118 118
119 dev->virt_addr = ioremap_nocache(resource, len);119 dev->virt_addr = ioremap(resource, len);
120 if (!dev->virt_addr) {120 if (!dev->virt_addr) {
121 dev_dbg(&pdev->dev, "start address cannot be mapped\n");121 dev_dbg(&pdev->dev, "start address cannot be mapped\n");
122 retval = -EFAULT;122 retval = -EFAULT;
drivers/usb/gadget/udc/goku_udc.c+1−1
@@ -1782,7 +1782,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 1781 unmodified lines
1782 }1782 }
1783 dev->got_region = 1;1783 dev->got_region = 1;
1784 1784
1785 base = ioremap_nocache(resource, len);1785 base = ioremap(resource, len);
1786 if (base == NULL) {1786 if (base == NULL) {
1787 DBG(dev, "can't map memory\n");1787 DBG(dev, "can't map memory\n");
1788 retval = -EFAULT;1788 retval = -EFAULT;
drivers/usb/gadget/udc/net2272.c+3−3
@@ -2323,7 +2323,7 @@ net2272_rdk1_probe(struct pci_dev *pdev, struct net2272 *dev) · 2322 unmodified lines
2323 goto err;2323 goto err;
2324 }2324 }
2325 2325
2326 mem_mapped_addr[i] = ioremap_nocache(resource, len);2326 mem_mapped_addr[i] = ioremap(resource, len);
2327 if (mem_mapped_addr[i] == NULL) {2327 if (mem_mapped_addr[i] == NULL) {
2328 release_mem_region(resource, len);2328 release_mem_region(resource, len);
2329 dev_dbg(dev->dev, "can't map memory\n");2329 dev_dbg(dev->dev, "can't map memory\n");
@@ -2401,7 +2401,7 @@ net2272_rdk2_probe(struct pci_dev *pdev, struct net2272 *dev) · 71 unmodified lines
2401 goto err;2401 goto err;
2402 }2402 }
2403 2403
2404 mem_mapped_addr[i] = ioremap_nocache(resource, len);2404 mem_mapped_addr[i] = ioremap(resource, len);
2405 if (mem_mapped_addr[i] == NULL) {2405 if (mem_mapped_addr[i] == NULL) {
2406 release_mem_region(resource, len);2406 release_mem_region(resource, len);
2407 dev_dbg(dev->dev, "can't map memory\n");2407 dev_dbg(dev->dev, "can't map memory\n");
@@ -2625,7 +2625,7 @@ net2272_plat_probe(struct platform_device *pdev) · 217 unmodified lines
2625 ret = -EBUSY;2625 ret = -EBUSY;
2626 goto err;2626 goto err;
2627 }2627 }
2628 dev->base_addr = ioremap_nocache(base, len);2628 dev->base_addr = ioremap(base, len);
2629 if (!dev->base_addr) {2629 if (!dev->base_addr) {
2630 dev_dbg(dev->dev, "can't map memory\n");2630 dev_dbg(dev->dev, "can't map memory\n");
2631 ret = -EFAULT;2631 ret = -EFAULT;
drivers/usb/gadget/udc/net2280.c+1−1
@@ -3659,7 +3659,7 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 3658 unmodified lines
3659 * 8051 code into the chip, e.g. to turn on PCI PM.3659 * 8051 code into the chip, e.g. to turn on PCI PM.
3660 */3660 */
3661 3661
3662 base = ioremap_nocache(resource, len);3662 base = ioremap(resource, len);
3663 if (base == NULL) {3663 if (base == NULL) {
3664 ep_dbg(dev, "can't map memory\n");3664 ep_dbg(dev, "can't map memory\n");
3665 retval = -EFAULT;3665 retval = -EFAULT;
drivers/usb/host/ehci-pmcmsp.c+3−3
@@ -107,7 +107,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev) · 106 unmodified lines
107 if (!request_mem_region(res->start, res_len, "mab regs"))107 if (!request_mem_region(res->start, res_len, "mab regs"))
108 return -EBUSY;108 return -EBUSY;
109 109
110 dev->mab_regs = ioremap_nocache(res->start, res_len);110 dev->mab_regs = ioremap(res->start, res_len);
111 if (dev->mab_regs == NULL) {111 if (dev->mab_regs == NULL) {
112 retval = -ENOMEM;112 retval = -ENOMEM;
113 goto err1;113 goto err1;
@@ -124,7 +124,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev) · 10 unmodified lines
124 retval = -EBUSY;124 retval = -EBUSY;
125 goto err2;125 goto err2;
126 }126 }
127 dev->usbid_regs = ioremap_nocache(res->start, res_len);127 dev->usbid_regs = ioremap(res->start, res_len);
128 if (dev->usbid_regs == NULL) {128 if (dev->usbid_regs == NULL) {
129 retval = -ENOMEM;129 retval = -ENOMEM;
130 goto err3;130 goto err3;
@@ -178,7 +178,7 @@ int usb_hcd_msp_probe(const struct hc_driver *driver, · 47 unmodified lines
178 retval = -EBUSY;178 retval = -EBUSY;
179 goto err1;179 goto err1;
180 }180 }
181 hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);181 hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
182 if (!hcd->regs) {182 if (!hcd->regs) {
183 pr_debug("ioremap failed");183 pr_debug("ioremap failed");
184 retval = -ENOMEM;184 retval = -ENOMEM;
drivers/usb/host/pci-quirks.c+1−1
@@ -1150,7 +1150,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) · 1149 unmodified lines
1150 if (!mmio_resource_enabled(pdev, 0))1150 if (!mmio_resource_enabled(pdev, 0))
1151 return;1151 return;
1152 1152
1153 base = ioremap_nocache(pci_resource_start(pdev, 0), len);1153 base = ioremap(pci_resource_start(pdev, 0), len);
1154 if (base == NULL)1154 if (base == NULL)
1155 return;1155 return;
1156 1156
drivers/usb/isp1760/isp1760-if.c+2−2
@@ -50,7 +50,7 @@ static int isp1761_pci_init(struct pci_dev *dev) · 49 unmodified lines
50 }50 }
51 51
52 /* map available memory */52 /* map available memory */
53 iobase = ioremap_nocache(mem_start, mem_length);53 iobase = ioremap(mem_start, mem_length);
54 if (!iobase) {54 if (!iobase) {
55 printk(KERN_ERR "Error ioremap failed\n");55 printk(KERN_ERR "Error ioremap failed\n");
56 release_mem_region(mem_start, mem_length);56 release_mem_region(mem_start, mem_length);
@@ -101,7 +101,7 @@ static int isp1761_pci_init(struct pci_dev *dev) · 44 unmodified lines
101 return -EBUSY;101 return -EBUSY;
102 }102 }
103 103
104 iobase = ioremap_nocache(mem_start, mem_length);104 iobase = ioremap(mem_start, mem_length);
105 if (!iobase) {105 if (!iobase) {
106 printk(KERN_ERR "ioremap #1\n");106 printk(KERN_ERR "ioremap #1\n");
107 release_mem_region(mem_start, mem_length);107 release_mem_region(mem_start, mem_length);
drivers/usb/roles/intel-xhci-usb-role-switch.c+1−1
@@ -161,7 +161,7 @@ static int intel_xhci_usb_probe(struct platform_device *pdev) · 160 unmodified lines
161 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);161 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
162 if (!res)162 if (!res)
163 return -EINVAL;163 return -EINVAL;
164 data->base = devm_ioremap_nocache(dev, res->start, resource_size(res));164 data->base = devm_ioremap(dev, res->start, resource_size(res));
165 if (!data->base)165 if (!data->base)
166 return -ENOMEM;166 return -ENOMEM;
167 167
drivers/usb/typec/ucsi/ucsi_acpi.c+1−1
@@ -127,7 +127,7 @@ static int ucsi_acpi_probe(struct platform_device *pdev) · 126 unmodified lines
127 return -ENODEV;127 return -ENODEV;
128 }128 }
129 129
130 /* This will make sure we can use ioremap_nocache() */130 /* This will make sure we can use ioremap() */
131 status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1);131 status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1);
132 if (ACPI_FAILURE(status))132 if (ACPI_FAILURE(status))
133 return -ENOMEM;133 return -ENOMEM;
drivers/vfio/pci/vfio_pci_rdwr.c+1−1
@@ -230,7 +230,7 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf, · 229 unmodified lines
230 switch ((u32)pos) {230 switch ((u32)pos) {
231 case 0xa0000 ... 0xbffff:231 case 0xa0000 ... 0xbffff:
232 count = min(count, (size_t)(0xc0000 - pos));232 count = min(count, (size_t)(0xc0000 - pos));
233 iomem = ioremap_nocache(0xa0000, 0xbffff - 0xa0000 + 1);233 iomem = ioremap(0xa0000, 0xbffff - 0xa0000 + 1);
234 off = pos - 0xa0000;234 off = pos - 0xa0000;
235 rsrc = VGA_RSRC_LEGACY_MEM;235 rsrc = VGA_RSRC_LEGACY_MEM;
236 is_ioport = false;236 is_ioport = false;
drivers/vfio/platform/reset/vfio_platform_amdxgbe.c+2−2
@@ -54,13 +54,13 @@ static int vfio_platform_amdxgbe_reset(struct vfio_platform_device *vdev) · 53 unmodified lines
54 54
55 if (!xgmac_regs->ioaddr) {55 if (!xgmac_regs->ioaddr) {
56 xgmac_regs->ioaddr =56 xgmac_regs->ioaddr =
57 ioremap_nocache(xgmac_regs->addr, xgmac_regs->size);57 ioremap(xgmac_regs->addr, xgmac_regs->size);
58 if (!xgmac_regs->ioaddr)58 if (!xgmac_regs->ioaddr)
59 return -ENOMEM;59 return -ENOMEM;
60 }60 }
61 if (!xpcs_regs->ioaddr) {61 if (!xpcs_regs->ioaddr) {
62 xpcs_regs->ioaddr =62 xpcs_regs->ioaddr =
63 ioremap_nocache(xpcs_regs->addr, xpcs_regs->size);63 ioremap(xpcs_regs->addr, xpcs_regs->size);
64 if (!xpcs_regs->ioaddr)64 if (!xpcs_regs->ioaddr)
65 return -ENOMEM;65 return -ENOMEM;
66 }66 }
drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c+1−1
@@ -82,7 +82,7 @@ static int vfio_platform_bcmflexrm_reset(struct vfio_platform_device *vdev) · 81 unmodified lines
82 82
83 /* Map FlexRM ring registers if not mapped */83 /* Map FlexRM ring registers if not mapped */
84 if (!reg->ioaddr) {84 if (!reg->ioaddr) {
85 reg->ioaddr = ioremap_nocache(reg->addr, reg->size);85 reg->ioaddr = ioremap(reg->addr, reg->size);
86 if (!reg->ioaddr)86 if (!reg->ioaddr)
87 return -ENOMEM;87 return -ENOMEM;
88 }88 }
drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c+1−1
@@ -52,7 +52,7 @@ static int vfio_platform_calxedaxgmac_reset(struct vfio_platform_device *vdev) · 51 unmodified lines
52 52
53 if (!reg->ioaddr) {53 if (!reg->ioaddr) {
54 reg->ioaddr =54 reg->ioaddr =
55 ioremap_nocache(reg->addr, reg->size);55 ioremap(reg->addr, reg->size);
56 if (!reg->ioaddr)56 if (!reg->ioaddr)
57 return -ENOMEM;57 return -ENOMEM;
58 }58 }
drivers/vfio/platform/vfio_platform_common.c+2−2
@@ -409,7 +409,7 @@ static ssize_t vfio_platform_read_mmio(struct vfio_platform_region *reg, · 408 unmodified lines
409 409
410 if (!reg->ioaddr) {410 if (!reg->ioaddr) {
411 reg->ioaddr =411 reg->ioaddr =
412 ioremap_nocache(reg->addr, reg->size);412 ioremap(reg->addr, reg->size);
413 413
414 if (!reg->ioaddr)414 if (!reg->ioaddr)
415 return -ENOMEM;415 return -ENOMEM;
@@ -486,7 +486,7 @@ static ssize_t vfio_platform_write_mmio(struct vfio_platform_region *reg, · 70 unmodified lines
486 486
487 if (!reg->ioaddr) {487 if (!reg->ioaddr) {
488 reg->ioaddr =488 reg->ioaddr =
489 ioremap_nocache(reg->addr, reg->size);489 ioremap(reg->addr, reg->size);
490 490
491 if (!reg->ioaddr)491 if (!reg->ioaddr)
492 return -ENOMEM;492 return -ENOMEM;
drivers/video/fbdev/carminefb.c+2−2
@@ -633,7 +633,7 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent) · 632 unmodified lines
633 ret = -EBUSY;633 ret = -EBUSY;
634 goto err_free_hw;634 goto err_free_hw;
635 }635 }
636 hw->v_regs = ioremap_nocache(carminefb_fix.mmio_start,636 hw->v_regs = ioremap(carminefb_fix.mmio_start,
637 carminefb_fix.mmio_len);637 carminefb_fix.mmio_len);
638 if (!hw->v_regs) {638 if (!hw->v_regs) {
639 printk(KERN_ERR "carminefb: Can't remap %s register.\n",639 printk(KERN_ERR "carminefb: Can't remap %s register.\n",
@@ -664,7 +664,7 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent) · 24 unmodified lines
664 goto err_unmap_vregs;664 goto err_unmap_vregs;
665 }665 }
666 666
667 hw->screen_mem = ioremap_nocache(carminefb_fix.smem_start,667 hw->screen_mem = ioremap(carminefb_fix.smem_start,
668 carminefb_fix.smem_len);668 carminefb_fix.smem_len);
669 if (!hw->screen_mem) {669 if (!hw->screen_mem) {
670 printk(KERN_ERR "carmine: Can't ioremap smem area.\n");670 printk(KERN_ERR "carmine: Can't ioremap smem area.\n");
drivers/video/fbdev/i810/i810_main.c+1−1
@@ -1883,7 +1883,7 @@ static int i810_allocate_pci_resource(struct i810fb_par *par, · 1882 unmodified lines
1883 }1883 }
1884 par->res_flags |= MMIO_REQ;1884 par->res_flags |= MMIO_REQ;
1885 1885
1886 par->mmio_start_virtual = ioremap_nocache(par->mmio_start_phys, 1886 par->mmio_start_virtual = ioremap(par->mmio_start_phys,
1887 MMIO_SIZE);1887 MMIO_SIZE);
1888 if (!par->mmio_start_virtual) {1888 if (!par->mmio_start_virtual) {
1889 printk("i810fb_init: cannot remap mmio region\n");1889 printk("i810fb_init: cannot remap mmio region\n");
drivers/video/fbdev/intelfb/intelfbdrv.c+1−1
@@ -654,7 +654,7 @@ static int intelfb_pci_register(struct pci_dev *pdev, · 653 unmodified lines
654 }654 }
655 655
656 dinfo->mmio_base =656 dinfo->mmio_base =
657 (u8 __iomem *)ioremap_nocache(dinfo->mmio_base_phys,657 (u8 __iomem *)ioremap(dinfo->mmio_base_phys,
658 INTEL_REG_SIZE);658 INTEL_REG_SIZE);
659 if (!dinfo->mmio_base) {659 if (!dinfo->mmio_base) {
660 ERR_MSG("Cannot remap MMIO region.\n");660 ERR_MSG("Cannot remap MMIO region.\n");
drivers/video/fbdev/kyro/fbdev.c+1−1
@@ -683,7 +683,7 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · 682 unmodified lines
683 kyro_fix.mmio_len = pci_resource_len(pdev, 1);683 kyro_fix.mmio_len = pci_resource_len(pdev, 1);
684 684
685 currentpar->regbase = deviceInfo.pSTGReg =685 currentpar->regbase = deviceInfo.pSTGReg =
686 ioremap_nocache(kyro_fix.mmio_start, kyro_fix.mmio_len);686 ioremap(kyro_fix.mmio_start, kyro_fix.mmio_len);
687 if (!currentpar->regbase)687 if (!currentpar->regbase)
688 goto out_free_fb;688 goto out_free_fb;
689 689
drivers/video/fbdev/matrox/matroxfb_base.c+1−1
@@ -1710,7 +1710,7 @@ static int initMatrox2(struct matrox_fb_info *minfo, struct board *b) · 1709 unmodified lines
1710 memsize = mem;1710 memsize = mem;
1711 err = -ENOMEM;1711 err = -ENOMEM;
1712 1712
1713 minfo->mmio.vbase.vaddr = ioremap_nocache(ctrlptr_phys, 16384);1713 minfo->mmio.vbase.vaddr = ioremap(ctrlptr_phys, 16384);
1714 if (!minfo->mmio.vbase.vaddr) {1714 if (!minfo->mmio.vbase.vaddr) {
1715 printk(KERN_ERR "matroxfb: cannot ioremap(%lX, 16384), matroxfb disabled\n", ctrlptr_phys);1715 printk(KERN_ERR "matroxfb: cannot ioremap(%lX, 16384), matroxfb disabled\n", ctrlptr_phys);
1716 goto failVideoMR;1716 goto failVideoMR;
drivers/video/fbdev/mbx/mbxfb.c+2−2
@@ -938,7 +938,7 @@ static int mbxfb_probe(struct platform_device *dev) · 937 unmodified lines
938 }938 }
939 mfbi->reg_phys_addr = mfbi->reg_res->start;939 mfbi->reg_phys_addr = mfbi->reg_res->start;
940 940
941 mfbi->reg_virt_addr = devm_ioremap_nocache(&dev->dev,941 mfbi->reg_virt_addr = devm_ioremap(&dev->dev,
942 mfbi->reg_phys_addr,942 mfbi->reg_phys_addr,
943 res_size(mfbi->reg_req));943 res_size(mfbi->reg_req));
944 if (!mfbi->reg_virt_addr) {944 if (!mfbi->reg_virt_addr) {
@@ -948,7 +948,7 @@ static int mbxfb_probe(struct platform_device *dev) · 3 unmodified lines
948 }948 }
949 virt_base_2700 = mfbi->reg_virt_addr;949 virt_base_2700 = mfbi->reg_virt_addr;
950 950
951 mfbi->fb_virt_addr = devm_ioremap_nocache(&dev->dev, mfbi->fb_phys_addr,951 mfbi->fb_virt_addr = devm_ioremap(&dev->dev, mfbi->fb_phys_addr,
952 res_size(mfbi->fb_req));952 res_size(mfbi->fb_req));
953 if (!mfbi->fb_virt_addr) {953 if (!mfbi->fb_virt_addr) {
954 dev_err(&dev->dev, "failed to ioremap frame buffer\n");954 dev_err(&dev->dev, "failed to ioremap frame buffer\n");
drivers/video/fbdev/mmp/hw/mmp_ctrl.c+1−1
@@ -485,7 +485,7 @@ static int mmphw_probe(struct platform_device *pdev) · 484 unmodified lines
485 goto failed;485 goto failed;
486 }486 }
487 487
488 ctrl->reg_base = devm_ioremap_nocache(ctrl->dev,488 ctrl->reg_base = devm_ioremap(ctrl->dev,
489 res->start, resource_size(res));489 res->start, resource_size(res));
490 if (ctrl->reg_base == NULL) {490 if (ctrl->reg_base == NULL) {
491 dev_err(ctrl->dev, "%s: res %pR map failed\n", __func__, res);491 dev_err(ctrl->dev, "%s: res %pR map failed\n", __func__, res);
drivers/video/fbdev/pm2fb.c+1−1
@@ -1563,7 +1563,7 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 1562 unmodified lines
1563 goto err_exit_neither;1563 goto err_exit_neither;
1564 }1564 }
1565 default_par->v_regs =1565 default_par->v_regs =
1566 ioremap_nocache(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len);1566 ioremap(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len);
1567 if (!default_par->v_regs) {1567 if (!default_par->v_regs) {
1568 printk(KERN_WARNING "pm2fb: Can't remap %s register area.\n",1568 printk(KERN_WARNING "pm2fb: Can't remap %s register area.\n",
1569 pm2fb_fix.id);1569 pm2fb_fix.id);
drivers/video/fbdev/pm3fb.c+2−2
@@ -1236,7 +1236,7 @@ static unsigned long pm3fb_size_memory(struct pm3_par *par) · 1235 unmodified lines
1236 return 0;1236 return 0;
1237 }1237 }
1238 screen_mem =1238 screen_mem =
1239 ioremap_nocache(pm3fb_fix.smem_start, pm3fb_fix.smem_len);1239 ioremap(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
1240 if (!screen_mem) {1240 if (!screen_mem) {
1241 printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n");1241 printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n");
1242 release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);1242 release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
@@ -1347,7 +1347,7 @@ static int pm3fb_probe(struct pci_dev *dev, const struct pci_device_id *ent) · 104 unmodified lines
1347 goto err_exit_neither;1347 goto err_exit_neither;
1348 }1348 }
1349 par->v_regs =1349 par->v_regs =
1350 ioremap_nocache(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);1350 ioremap(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
1351 if (!par->v_regs) {1351 if (!par->v_regs) {
1352 printk(KERN_WARNING "pm3fb: Can't remap %s register area.\n",1352 printk(KERN_WARNING "pm3fb: Can't remap %s register area.\n",
1353 pm3fb_fix.id);1353 pm3fb_fix.id);
drivers/video/fbdev/pmag-aa-fb.c+2−2
@@ -188,7 +188,7 @@ static int pmagaafb_probe(struct device *dev) · 187 unmodified lines
188 188
189 /* MMIO mapping setup. */189 /* MMIO mapping setup. */
190 info->fix.mmio_start = start + PMAG_AA_BT455_OFFSET;190 info->fix.mmio_start = start + PMAG_AA_BT455_OFFSET;
191 par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);191 par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
192 if (!par->mmio) {192 if (!par->mmio) {
193 printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));193 printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
194 err = -ENOMEM;194 err = -ENOMEM;
@@ -199,7 +199,7 @@ static int pmagaafb_probe(struct device *dev) · 4 unmodified lines
199 199
200 /* Frame buffer mapping setup. */200 /* Frame buffer mapping setup. */
201 info->fix.smem_start = start + PMAG_AA_ONBOARD_FBMEM_OFFSET;201 info->fix.smem_start = start + PMAG_AA_ONBOARD_FBMEM_OFFSET;
202 info->screen_base = ioremap_nocache(info->fix.smem_start,202 info->screen_base = ioremap(info->fix.smem_start,
203 info->fix.smem_len);203 info->fix.smem_len);
204 if (!info->screen_base) {204 if (!info->screen_base) {
205 printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));205 printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
drivers/video/fbdev/pmag-ba-fb.c+2−2
@@ -180,7 +180,7 @@ static int pmagbafb_probe(struct device *dev) · 179 unmodified lines
180 180
181 /* MMIO mapping setup. */181 /* MMIO mapping setup. */
182 info->fix.mmio_start = start;182 info->fix.mmio_start = start;
183 par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);183 par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
184 if (!par->mmio) {184 if (!par->mmio) {
185 printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));185 printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
186 err = -ENOMEM;186 err = -ENOMEM;
@@ -190,7 +190,7 @@ static int pmagbafb_probe(struct device *dev) · 3 unmodified lines
190 190
191 /* Frame buffer mapping setup. */191 /* Frame buffer mapping setup. */
192 info->fix.smem_start = start + PMAG_BA_FBMEM;192 info->fix.smem_start = start + PMAG_BA_FBMEM;
193 info->screen_base = ioremap_nocache(info->fix.smem_start,193 info->screen_base = ioremap(info->fix.smem_start,
194 info->fix.smem_len);194 info->fix.smem_len);
195 if (!info->screen_base) {195 if (!info->screen_base) {
196 printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));196 printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
drivers/video/fbdev/pmagb-b-fb.c+2−2
@@ -287,7 +287,7 @@ static int pmagbbfb_probe(struct device *dev) · 286 unmodified lines
287 287
288 /* MMIO mapping setup. */288 /* MMIO mapping setup. */
289 info->fix.mmio_start = start;289 info->fix.mmio_start = start;
290 par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);290 par->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
291 if (!par->mmio) {291 if (!par->mmio) {
292 printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));292 printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
293 err = -ENOMEM;293 err = -ENOMEM;
@@ -298,7 +298,7 @@ static int pmagbbfb_probe(struct device *dev) · 4 unmodified lines
298 298
299 /* Frame buffer mapping setup. */299 /* Frame buffer mapping setup. */
300 info->fix.smem_start = start + PMAGB_B_FBMEM;300 info->fix.smem_start = start + PMAGB_B_FBMEM;
301 par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);301 par->smem = ioremap(info->fix.smem_start, info->fix.smem_len);
302 if (!par->smem) {302 if (!par->smem) {
303 printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));303 printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
304 err = -ENOMEM;304 err = -ENOMEM;
drivers/video/fbdev/pvr2fb.c+2−2
@@ -770,7 +770,7 @@ static int __maybe_unused pvr2fb_common_init(void) · 769 unmodified lines
770 struct pvr2fb_par *par = currentpar;770 struct pvr2fb_par *par = currentpar;
771 unsigned long modememused, rev;771 unsigned long modememused, rev;
772 772
773 fb_info->screen_base = ioremap_nocache(pvr2_fix.smem_start,773 fb_info->screen_base = ioremap(pvr2_fix.smem_start,
774 pvr2_fix.smem_len);774 pvr2_fix.smem_len);
775 775
776 if (!fb_info->screen_base) {776 if (!fb_info->screen_base) {
@@ -778,7 +778,7 @@ static int __maybe_unused pvr2fb_common_init(void) · 1 unmodified line
778 goto out_err;778 goto out_err;
779 }779 }
780 780
781 par->mmio_base = ioremap_nocache(pvr2_fix.mmio_start,781 par->mmio_base = ioremap(pvr2_fix.mmio_start,
782 pvr2_fix.mmio_len);782 pvr2_fix.mmio_len);
783 if (!par->mmio_base) {783 if (!par->mmio_base) {
784 printk(KERN_ERR "pvr2fb: Failed to remap mmio space\n");784 printk(KERN_ERR "pvr2fb: Failed to remap mmio space\n");
drivers/video/fbdev/pxa168fb.c+1−1
@@ -665,7 +665,7 @@ static int pxa168fb_probe(struct platform_device *pdev) · 664 unmodified lines
665 /*665 /*
666 * Map LCD controller registers.666 * Map LCD controller registers.
667 */667 */
668 fbi->reg_base = devm_ioremap_nocache(&pdev->dev, res->start,668 fbi->reg_base = devm_ioremap(&pdev->dev, res->start,
669 resource_size(res));669 resource_size(res));
670 if (fbi->reg_base == NULL) {670 if (fbi->reg_base == NULL) {
671 ret = -ENOMEM;671 ret = -ENOMEM;
drivers/video/fbdev/s1d13xxxfb.c+2−2
@@ -809,7 +809,7 @@ static int s1d13xxxfb_probe(struct platform_device *pdev) · 808 unmodified lines
809 809
810 platform_set_drvdata(pdev, info);810 platform_set_drvdata(pdev, info);
811 default_par = info->par;811 default_par = info->par;
812 default_par->regs = ioremap_nocache(pdev->resource[1].start,812 default_par->regs = ioremap(pdev->resource[1].start,
813 pdev->resource[1].end - pdev->resource[1].start +1);813 pdev->resource[1].end - pdev->resource[1].start +1);
814 if (!default_par->regs) {814 if (!default_par->regs) {
815 printk(KERN_ERR PFX "unable to map registers\n");815 printk(KERN_ERR PFX "unable to map registers\n");
@@ -818,7 +818,7 @@ static int s1d13xxxfb_probe(struct platform_device *pdev) · 2 unmodified lines
818 }818 }
819 info->pseudo_palette = default_par->pseudo_palette;819 info->pseudo_palette = default_par->pseudo_palette;
820 820
821 info->screen_base = ioremap_nocache(pdev->resource[0].start,821 info->screen_base = ioremap(pdev->resource[0].start,
822 pdev->resource[0].end - pdev->resource[0].start +1);822 pdev->resource[0].end - pdev->resource[0].start +1);
823 823
824 if (!info->screen_base) {824 if (!info->screen_base) {
drivers/video/fbdev/sh7760fb.c+1−1
@@ -463,7 +463,7 @@ static int sh7760fb_probe(struct platform_device *pdev) · 462 unmodified lines
463 goto out_fb;463 goto out_fb;
464 }464 }
465 465
466 par->base = ioremap_nocache(res->start, resource_size(res));466 par->base = ioremap(res->start, resource_size(res));
467 if (!par->base) {467 if (!par->base) {
468 dev_err(&pdev->dev, "cannot remap\n");468 dev_err(&pdev->dev, "cannot remap\n");
469 ret = -ENODEV;469 ret = -ENODEV;
drivers/video/fbdev/sh_mobile_lcdcfb.c+1−1
@@ -2588,7 +2588,7 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev) · 2587 unmodified lines
2588 if (num_channels == 2)2588 if (num_channels == 2)
2589 priv->forced_fourcc = pdata->ch[0].fourcc;2589 priv->forced_fourcc = pdata->ch[0].fourcc;
2590 2590
2591 priv->base = ioremap_nocache(res->start, resource_size(res));2591 priv->base = ioremap(res->start, resource_size(res));
2592 if (!priv->base) {2592 if (!priv->base) {
2593 error = -ENOMEM;2593 error = -ENOMEM;
2594 goto err1;2594 goto err1;
drivers/video/fbdev/sstfb.c+2−2
@@ -1363,14 +1363,14 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 1362 unmodified lines
1363 goto fail_fb_mem;1363 goto fail_fb_mem;
1364 }1364 }
1365 1365
1366 par->mmio_vbase = ioremap_nocache(fix->mmio_start,1366 par->mmio_vbase = ioremap(fix->mmio_start,
1367 fix->mmio_len);1367 fix->mmio_len);
1368 if (!par->mmio_vbase) {1368 if (!par->mmio_vbase) {
1369 printk(KERN_ERR "sstfb: cannot remap register area %#lx\n",1369 printk(KERN_ERR "sstfb: cannot remap register area %#lx\n",
1370 fix->mmio_start);1370 fix->mmio_start);
1371 goto fail_mmio_remap;1371 goto fail_mmio_remap;
1372 }1372 }
1373 info->screen_base = ioremap_nocache(fix->smem_start, 0x400000);1373 info->screen_base = ioremap(fix->smem_start, 0x400000);
1374 if (!info->screen_base) {1374 if (!info->screen_base) {
1375 printk(KERN_ERR "sstfb: cannot remap framebuffer %#lx\n",1375 printk(KERN_ERR "sstfb: cannot remap framebuffer %#lx\n",
1376 fix->smem_start);1376 fix->smem_start);
drivers/video/fbdev/stifb.c+2−2
@@ -1198,7 +1198,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) · 1197 unmodified lines
1198 case S9000_ID_TOMCAT: /* Dual CRX, behaves else like a CRX */1198 case S9000_ID_TOMCAT: /* Dual CRX, behaves else like a CRX */
1199 /* FIXME: TomCat supports two heads:1199 /* FIXME: TomCat supports two heads:
1200 * fb.iobase = REGION_BASE(fb_info,3);1200 * fb.iobase = REGION_BASE(fb_info,3);
1201 * fb.screen_base = ioremap_nocache(REGION_BASE(fb_info,2),xxx);1201 * fb.screen_base = ioremap(REGION_BASE(fb_info,2),xxx);
1202 * for now we only support the left one ! */1202 * for now we only support the left one ! */
1203 xres = fb->ngle_rom.x_size_visible;1203 xres = fb->ngle_rom.x_size_visible;
1204 yres = fb->ngle_rom.y_size_visible;1204 yres = fb->ngle_rom.y_size_visible;
@@ -1291,7 +1291,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) · 86 unmodified lines
1291 1291
1292 strcpy(fix->id, "stifb");1292 strcpy(fix->id, "stifb");
1293 info->fbops = &stifb_ops;1293 info->fbops = &stifb_ops;
1294 info->screen_base = ioremap_nocache(REGION_BASE(fb,1), fix->smem_len);1294 info->screen_base = ioremap(REGION_BASE(fb,1), fix->smem_len);
1295 if (!info->screen_base) {1295 if (!info->screen_base) {
1296 printk(KERN_ERR "stifb: failed to map memory\n");1296 printk(KERN_ERR "stifb: failed to map memory\n");
1297 goto out_err0;1297 goto out_err0;
drivers/video/fbdev/tdfxfb.c+1−1
@@ -1417,7 +1417,7 @@ static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 1416 unmodified lines
1417 }1417 }
1418 1418
1419 default_par->regbase_virt =1419 default_par->regbase_virt =
1420 ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);1420 ioremap(info->fix.mmio_start, info->fix.mmio_len);
1421 if (!default_par->regbase_virt) {1421 if (!default_par->regbase_virt) {
1422 printk(KERN_ERR "fb: Can't remap %s register area.\n",1422 printk(KERN_ERR "fb: Can't remap %s register area.\n",
1423 info->fix.id);1423 info->fix.id);
drivers/video/fbdev/tgafb.c+1−1
@@ -1438,7 +1438,7 @@ static int tgafb_register(struct device *dev) · 1437 unmodified lines
1438 }1438 }
1439 1439
1440 /* Map the framebuffer. */1440 /* Map the framebuffer. */
1441 mem_base = ioremap_nocache(bar0_start, bar0_len);1441 mem_base = ioremap(bar0_start, bar0_len);
1442 if (!mem_base) {1442 if (!mem_base) {
1443 printk(KERN_ERR "tgafb: Cannot map MMIO\n");1443 printk(KERN_ERR "tgafb: Cannot map MMIO\n");
1444 goto err1;1444 goto err1;
drivers/video/fbdev/tridentfb.c+2−2
@@ -1556,7 +1556,7 @@ static int trident_pci_probe(struct pci_dev *dev, · 1555 unmodified lines
1556 return -1;1556 return -1;
1557 }1557 }
1558 1558
1559 default_par->io_virt = ioremap_nocache(tridentfb_fix.mmio_start,1559 default_par->io_virt = ioremap(tridentfb_fix.mmio_start,
1560 tridentfb_fix.mmio_len);1560 tridentfb_fix.mmio_len);
1561 1561
1562 if (!default_par->io_virt) {1562 if (!default_par->io_virt) {
@@ -1579,7 +1579,7 @@ static int trident_pci_probe(struct pci_dev *dev, · 16 unmodified lines
1579 goto out_unmap1;1579 goto out_unmap1;
1580 }1580 }
1581 1581
1582 info->screen_base = ioremap_nocache(tridentfb_fix.smem_start,1582 info->screen_base = ioremap(tridentfb_fix.smem_start,
1583 tridentfb_fix.smem_len);1583 tridentfb_fix.smem_len);
1584 1584
1585 if (!info->screen_base) {1585 if (!info->screen_base) {
drivers/video/fbdev/valkyriefb.c+1−1
@@ -356,7 +356,7 @@ int __init valkyriefb_init(void) · 355 unmodified lines
356 p->total_vram = 0x100000;356 p->total_vram = 0x100000;
357 p->frame_buffer_phys = frame_buffer_phys;357 p->frame_buffer_phys = frame_buffer_phys;
358#ifdef CONFIG_MAC358#ifdef CONFIG_MAC
359 p->frame_buffer = ioremap_nocache(frame_buffer_phys, p->total_vram);359 p->frame_buffer = ioremap(frame_buffer_phys, p->total_vram);
360#else360#else
361 p->frame_buffer = ioremap_wt(frame_buffer_phys, p->total_vram);361 p->frame_buffer = ioremap_wt(frame_buffer_phys, p->total_vram);
362#endif362#endif
drivers/video/fbdev/vermilion/cr_pll.c+1−1
@@ -159,7 +159,7 @@ static int __init cr_pll_init(void) · 158 unmodified lines
159 pci_read_config_dword(mch_dev, CRVML_REG_MCHBAR,159 pci_read_config_dword(mch_dev, CRVML_REG_MCHBAR,
160 &mch_bar);160 &mch_bar);
161 mch_regs_base =161 mch_regs_base =
162 ioremap_nocache(mch_bar, CRVML_MCHMAP_SIZE);162 ioremap(mch_bar, CRVML_MCHMAP_SIZE);
163 if (!mch_regs_base) {163 if (!mch_regs_base) {
164 printk(KERN_ERR164 printk(KERN_ERR
165 "Carillo Ranch MCH device was not enabled.\n");165 "Carillo Ranch MCH device was not enabled.\n");
drivers/video/fbdev/vermilion/vermilion.c+2−2
@@ -317,7 +317,7 @@ static int vmlfb_enable_mmio(struct vml_par *par) · 316 unmodified lines
317 ": Could not claim display controller MMIO.\n");317 ": Could not claim display controller MMIO.\n");
318 return -EBUSY;318 return -EBUSY;
319 }319 }
320 par->vdc_mem = ioremap_nocache(par->vdc_mem_base, par->vdc_mem_size);320 par->vdc_mem = ioremap(par->vdc_mem_base, par->vdc_mem_size);
321 if (par->vdc_mem == NULL) {321 if (par->vdc_mem == NULL) {
322 printk(KERN_ERR MODULE_NAME322 printk(KERN_ERR MODULE_NAME
323 ": Could not map display controller MMIO.\n");323 ": Could not map display controller MMIO.\n");
@@ -332,7 +332,7 @@ static int vmlfb_enable_mmio(struct vml_par *par) · 8 unmodified lines
332 err = -EBUSY;332 err = -EBUSY;
333 goto out_err_1;333 goto out_err_1;
334 }334 }
335 par->gpu_mem = ioremap_nocache(par->gpu_mem_base, par->gpu_mem_size);335 par->gpu_mem = ioremap(par->gpu_mem_base, par->gpu_mem_size);
336 if (par->gpu_mem == NULL) {336 if (par->gpu_mem == NULL) {
337 printk(KERN_ERR MODULE_NAME ": Could not map GPU MMIO.\n");337 printk(KERN_ERR MODULE_NAME ": Could not map GPU MMIO.\n");
338 err = -ENOMEM;338 err = -ENOMEM;
drivers/video/fbdev/via/via-core.c+1−1
@@ -442,7 +442,7 @@ static int via_pci_setup_mmio(struct viafb_dev *vdev) · 441 unmodified lines
442 */442 */
443 vdev->engine_start = pci_resource_start(vdev->pdev, 1);443 vdev->engine_start = pci_resource_start(vdev->pdev, 1);
444 vdev->engine_len = pci_resource_len(vdev->pdev, 1);444 vdev->engine_len = pci_resource_len(vdev->pdev, 1);
445 vdev->engine_mmio = ioremap_nocache(vdev->engine_start,445 vdev->engine_mmio = ioremap(vdev->engine_start,
446 vdev->engine_len);446 vdev->engine_len);
447 if (vdev->engine_mmio == NULL)447 if (vdev->engine_mmio == NULL)
448 dev_err(&vdev->pdev->dev,448 dev_err(&vdev->pdev->dev,
drivers/video/fbdev/w100fb.c+3−3
@@ -648,12 +648,12 @@ int w100fb_probe(struct platform_device *pdev) · 647 unmodified lines
648 return -EINVAL;648 return -EINVAL;
649 649
650 /* Remap the chip base address */650 /* Remap the chip base address */
651 remapped_base = ioremap_nocache(mem->start+W100_CFG_BASE, W100_CFG_LEN);651 remapped_base = ioremap(mem->start+W100_CFG_BASE, W100_CFG_LEN);
652 if (remapped_base == NULL)652 if (remapped_base == NULL)
653 goto out;653 goto out;
654 654
655 /* Map the register space */655 /* Map the register space */
656 remapped_regs = ioremap_nocache(mem->start+W100_REG_BASE, W100_REG_LEN);656 remapped_regs = ioremap(mem->start+W100_REG_BASE, W100_REG_LEN);
657 if (remapped_regs == NULL)657 if (remapped_regs == NULL)
658 goto out;658 goto out;
659 659
@@ -672,7 +672,7 @@ int w100fb_probe(struct platform_device *pdev) · 12 unmodified lines
672 printk(" at 0x%08lx.\n", (unsigned long) mem->start+W100_CFG_BASE);672 printk(" at 0x%08lx.\n", (unsigned long) mem->start+W100_CFG_BASE);
673 673
674 /* Remap the framebuffer */674 /* Remap the framebuffer */
675 remapped_fbuf = ioremap_nocache(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);675 remapped_fbuf = ioremap(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);
676 if (remapped_fbuf == NULL)676 if (remapped_fbuf == NULL)
677 goto out;677 goto out;
678 678
drivers/vme/boards/vme_vmivme7805.c+1−1
@@ -55,7 +55,7 @@ static int vmic_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 54 unmodified lines
55 }55 }
56 56
57 /* Map registers in BAR 0 */57 /* Map registers in BAR 0 */
58 vmic_base = ioremap_nocache(pci_resource_start(pdev, 0), 16);58 vmic_base = ioremap(pci_resource_start(pdev, 0), 16);
59 if (!vmic_base) {59 if (!vmic_base) {
60 dev_err(&pdev->dev, "Unable to remap CRG region\n");60 dev_err(&pdev->dev, "Unable to remap CRG region\n");
61 retval = -EIO;61 retval = -EIO;
drivers/vme/bridges/vme_ca91cx42.c+2−2
@@ -554,7 +554,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, · 553 unmodified lines
554 goto err_resource;554 goto err_resource;
555 }555 }
556 556
557 image->kern_base = ioremap_nocache(557 image->kern_base = ioremap(
558 image->bus_resource.start, size);558 image->bus_resource.start, size);
559 if (!image->kern_base) {559 if (!image->kern_base) {
560 dev_err(ca91cx42_bridge->parent, "Failed to remap resource\n");560 dev_err(ca91cx42_bridge->parent, "Failed to remap resource\n");
@@ -1638,7 +1638,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 1077 unmodified lines
1638 }1638 }
1639 1639
1640 /* map registers in BAR 0 */1640 /* map registers in BAR 0 */
1641 ca91cx42_device->base = ioremap_nocache(pci_resource_start(pdev, 0),1641 ca91cx42_device->base = ioremap(pci_resource_start(pdev, 0),
1642 4096);1642 4096);
1643 if (!ca91cx42_device->base) {1643 if (!ca91cx42_device->base) {
1644 dev_err(&pdev->dev, "Unable to remap CRG region\n");1644 dev_err(&pdev->dev, "Unable to remap CRG region\n");
drivers/vme/bridges/vme_tsi148.c+2−2
@@ -770,7 +770,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, · 769 unmodified lines
770 goto err_resource;770 goto err_resource;
771 }771 }
772 772
773 image->kern_base = ioremap_nocache(773 image->kern_base = ioremap(
774 image->bus_resource.start, size);774 image->bus_resource.start, size);
775 if (!image->kern_base) {775 if (!image->kern_base) {
776 dev_err(tsi148_bridge->parent, "Failed to remap resource\n");776 dev_err(tsi148_bridge->parent, "Failed to remap resource\n");
@@ -2317,7 +2317,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 1540 unmodified lines
2317 }2317 }
2318 2318
2319 /* map registers in BAR 0 */2319 /* map registers in BAR 0 */
2320 tsi148_device->base = ioremap_nocache(pci_resource_start(pdev, 0),2320 tsi148_device->base = ioremap(pci_resource_start(pdev, 0),
2321 4096);2321 4096);
2322 if (!tsi148_device->base) {2322 if (!tsi148_device->base) {
2323 dev_err(&pdev->dev, "Unable to remap CRG region\n");2323 dev_err(&pdev->dev, "Unable to remap CRG region\n");
drivers/w1/masters/matrox_w1.c+1−1
@@ -139,7 +139,7 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent · 138 unmodified lines
139 139
140 dev->phys_addr = pci_resource_start(pdev, 1);140 dev->phys_addr = pci_resource_start(pdev, 1);
141 141
142 dev->virt_addr = ioremap_nocache(dev->phys_addr, 16384);142 dev->virt_addr = ioremap(dev->phys_addr, 16384);
143 if (!dev->virt_addr) {143 if (!dev->virt_addr) {
144 dev_err(&pdev->dev, "%s: failed to ioremap(0x%lx, %d).\n",144 dev_err(&pdev->dev, "%s: failed to ioremap(0x%lx, %d).\n",
145 __func__, dev->phys_addr, 16384);145 __func__, dev->phys_addr, 16384);
drivers/watchdog/bcm63xx_wdt.c+1−1
@@ -246,7 +246,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) · 245 unmodified lines
246 return -ENODEV;246 return -ENODEV;
247 }247 }
248 248
249 bcm63xx_wdt_device.regs = devm_ioremap_nocache(&pdev->dev, r->start,249 bcm63xx_wdt_device.regs = devm_ioremap(&pdev->dev, r->start,
250 resource_size(r));250 resource_size(r));
251 if (!bcm63xx_wdt_device.regs) {251 if (!bcm63xx_wdt_device.regs) {
252 dev_err(&pdev->dev, "failed to remap I/O resources\n");252 dev_err(&pdev->dev, "failed to remap I/O resources\n");
drivers/watchdog/intel_scu_watchdog.c+1−1
@@ -463,7 +463,7 @@ static int __init intel_scu_watchdog_init(void) · 462 unmodified lines
463 return -ENODEV;463 return -ENODEV;
464 }464 }
465 465
466 tmp_addr = ioremap_nocache(watchdog_device.timer_tbl_ptr->phys_addr,466 tmp_addr = ioremap(watchdog_device.timer_tbl_ptr->phys_addr,
467 20);467 20);
468 468
469 if (tmp_addr == NULL) {469 if (tmp_addr == NULL) {
drivers/watchdog/rc32434_wdt.c+2−2
@@ -26,7 +26,7 @@ · 25 unmodified lines
26#include <linux/platform_device.h> /* For platform_driver framework */26#include <linux/platform_device.h> /* For platform_driver framework */
27#include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */27#include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */
28#include <linux/uaccess.h> /* For copy_to_user/put_user/... */28#include <linux/uaccess.h> /* For copy_to_user/put_user/... */
29#include <linux/io.h> /* For devm_ioremap_nocache */29#include <linux/io.h> /* For devm_ioremap */
30 30
31#include <asm/mach-rc32434/integ.h> /* For the Watchdog registers */31#include <asm/mach-rc32434/integ.h> /* For the Watchdog registers */
32 32
@@ -267,7 +267,7 @@ static int rc32434_wdt_probe(struct platform_device *pdev) · 234 unmodified lines
267 return -ENODEV;267 return -ENODEV;
268 }268 }
269 269
270 wdt_reg = devm_ioremap_nocache(&pdev->dev, r->start, resource_size(r));270 wdt_reg = devm_ioremap(&pdev->dev, r->start, resource_size(r));
271 if (!wdt_reg) {271 if (!wdt_reg) {
272 pr_err("failed to remap I/O resources\n");272 pr_err("failed to remap I/O resources\n");
273 return -ENXIO;273 return -ENXIO;
include/asm-generic/io.h+0−4
@@ -960,10 +960,6 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size) · 959 unmodified lines
960}960}
961#endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */961#endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */
962 962
963#ifndef ioremap_nocache
964#define ioremap_nocache ioremap
965#endif
966
967#ifndef ioremap_wc963#ifndef ioremap_wc
968#define ioremap_wc ioremap964#define ioremap_wc ioremap
969#endif965#endif
include/asm-generic/iomap.h+2−2
@@ -94,11 +94,11 @@ extern void ioport_unmap(void __iomem *); · 93 unmodified lines
94#endif94#endif
95 95
96#ifndef ARCH_HAS_IOREMAP_WC96#ifndef ARCH_HAS_IOREMAP_WC
97#define ioremap_wc ioremap_nocache97#define ioremap_wc ioremap
98#endif98#endif
99 99
100#ifndef ARCH_HAS_IOREMAP_WT100#ifndef ARCH_HAS_IOREMAP_WT
101#define ioremap_wt ioremap_nocache101#define ioremap_wt ioremap
102#endif102#endif
103 103
104#ifdef CONFIG_PCI104#ifdef CONFIG_PCI
include/linux/io.h+2−4
@@ -66,8 +66,6 @@ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset, · 65 unmodified lines
66 resource_size_t size);66 resource_size_t size);
67void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,67void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
68 resource_size_t size);68 resource_size_t size);
69void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
70 resource_size_t size);
71void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,69void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,
72 resource_size_t size);70 resource_size_t size);
73void devm_iounmap(struct device *dev, void __iomem *addr);71void devm_iounmap(struct device *dev, void __iomem *addr);
@@ -87,7 +85,7 @@ void *__devm_memremap_pages(struct device *dev, struct resource *res); · 13 unmodified lines
87 * Posting") mandate non-posted configuration transactions. There is85 * Posting") mandate non-posted configuration transactions. There is
88 * no ioremap API in the kernel that can guarantee non-posted write86 * no ioremap API in the kernel that can guarantee non-posted write
89 * semantics across arches so provide a default implementation for87 * semantics across arches so provide a default implementation for
90 * mapping PCI config space that defaults to ioremap_nocache(); arches88 * mapping PCI config space that defaults to ioremap(); arches
91 * should override it if they have memory mapping implementations that89 * should override it if they have memory mapping implementations that
92 * guarantee non-posted writes semantics to make the memory mapping90 * guarantee non-posted writes semantics to make the memory mapping
93 * compliant with the PCI specification.91 * compliant with the PCI specification.
@@ -97,7 +95,7 @@ void *__devm_memremap_pages(struct device *dev, struct resource *res); · 3 unmodified lines
97static inline void __iomem *pci_remap_cfgspace(phys_addr_t offset,95static inline void __iomem *pci_remap_cfgspace(phys_addr_t offset,
98 size_t size)96 size_t size)
99{97{
100 return ioremap_nocache(offset, size);98 return ioremap(offset, size);
101}99}
102#endif100#endif
103#endif101#endif
lib/devres.c+0−20
@@ -8,7 +8,6 @@ · 7 unmodified lines
8 8
9enum devm_ioremap_type {9enum devm_ioremap_type {
10 DEVM_IOREMAP = 0,10 DEVM_IOREMAP = 0,
11 DEVM_IOREMAP_NC,
12 DEVM_IOREMAP_UC,11 DEVM_IOREMAP_UC,
13 DEVM_IOREMAP_WC,12 DEVM_IOREMAP_WC,
14};13};
@@ -37,9 +36,6 @@ static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset, · 22 unmodified lines
37 case DEVM_IOREMAP:36 case DEVM_IOREMAP:
38 addr = ioremap(offset, size);37 addr = ioremap(offset, size);
39 break;38 break;
40 case DEVM_IOREMAP_NC:
41 addr = ioremap_nocache(offset, size);
42 break;
43 case DEVM_IOREMAP_UC:39 case DEVM_IOREMAP_UC:
44 addr = ioremap_uc(offset, size);40 addr = ioremap_uc(offset, size);
45 break;41 break;
@@ -87,22 +83,6 @@ void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset, · 41 unmodified lines
87}83}
88EXPORT_SYMBOL_GPL(devm_ioremap_uc);84EXPORT_SYMBOL_GPL(devm_ioremap_uc);
89 85
90/**
91 * devm_ioremap_nocache - Managed ioremap_nocache()
92 * @dev: Generic device to remap IO address for
93 * @offset: Resource address to map
94 * @size: Size of map
95 *
96 * Managed ioremap_nocache(). Map is automatically unmapped on driver
97 * detach.
98 */
99void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
100 resource_size_t size)
101{
102 return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_NC);
103}
104EXPORT_SYMBOL(devm_ioremap_nocache);
105
106/**86/**
107 * devm_ioremap_wc - Managed ioremap_wc()87 * devm_ioremap_wc - Managed ioremap_wc()
108 * @dev: Generic device to remap IO address for88 * @dev: Generic device to remap IO address for
scripts/coccinelle/free/devm_free.cocci+0−4
@@ -51,8 +51,6 @@ expression x; · 50 unmodified lines
51 x = devm_request_irq(...)51 x = devm_request_irq(...)
52|52|
53 x = devm_ioremap(...)53 x = devm_ioremap(...)
54|
55 x = devm_ioremap_nocache(...)
56|54|
57 x = devm_ioport_map(...)55 x = devm_ioport_map(...)
58)56)
@@ -84,8 +82,6 @@ position p; · 25 unmodified lines
84 x = request_irq(...)82 x = request_irq(...)
85|83|
86 x = ioremap(...)84 x = ioremap(...)
87|
88 x = ioremap_nocache(...)
89|85|
90 x = ioport_map(...)86 x = ioport_map(...)
91)87)
scripts/coccinelle/free/iounmap.cocci+1−1
@@ -23,7 +23,7 @@ int ret; · 22 unmodified lines
23position p1,p2,p3;23position p1,p2,p3;
24@@24@@
25 25
26e = \(ioremap@p1\|ioremap_nocache@p1\)(...)26e = \(ioremap@p1\)(...)
27... when != iounmap(e)27... when != iounmap(e)
28if (<+...e...+>) S28if (<+...e...+>) S
29... when any29... when any
sound/drivers/ml403-ac97cr.c+1−1
@@ -1123,7 +1123,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev, · 1122 unmodified lines
1123 PDEBUG(INIT_INFO, "Trying to reserve resources now ...\n");1123 PDEBUG(INIT_INFO, "Trying to reserve resources now ...\n");
1124 resource = platform_get_resource(pfdev, IORESOURCE_MEM, 0);1124 resource = platform_get_resource(pfdev, IORESOURCE_MEM, 0);
1125 /* get "port" */1125 /* get "port" */
1126 ml403_ac97cr->port = ioremap_nocache(resource->start,1126 ml403_ac97cr->port = ioremap(resource->start,
1127 (resource->end) -1127 (resource->end) -
1128 (resource->start) + 1);1128 (resource->start) + 1);
1129 if (ml403_ac97cr->port == NULL) {1129 if (ml403_ac97cr->port == NULL) {
sound/isa/msnd/msnd_pinnacle.c+1−1
@@ -551,7 +551,7 @@ static int snd_msnd_attach(struct snd_card *card) · 550 unmodified lines
551 free_irq(chip->irq, chip);551 free_irq(chip->irq, chip);
552 return -EBUSY;552 return -EBUSY;
553 }553 }
554 chip->mappedbase = ioremap_nocache(chip->base, 0x8000);554 chip->mappedbase = ioremap(chip->base, 0x8000);
555 if (!chip->mappedbase) {555 if (!chip->mappedbase) {
556 printk(KERN_ERR LOGNAME556 printk(KERN_ERR LOGNAME
557 ": unable to map memory region 0x%lx-0x%lx\n",557 ": unable to map memory region 0x%lx-0x%lx\n",
sound/parisc/harmony.c+1−1
@@ -907,7 +907,7 @@ snd_harmony_create(struct snd_card *card, · 906 unmodified lines
907 h->card = card;907 h->card = card;
908 h->dev = padev;908 h->dev = padev;
909 h->irq = -1;909 h->irq = -1;
910 h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE);910 h->iobase = ioremap(padev->hpa.start, HARMONY_SIZE);
911 if (h->iobase == NULL) {911 if (h->iobase == NULL) {
912 printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",912 printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",
913 (unsigned long)padev->hpa.start);913 (unsigned long)padev->hpa.start);
sound/pci/aw2/aw2-alsa.c+1−1
@@ -271,7 +271,7 @@ static int snd_aw2_create(struct snd_card *card, · 270 unmodified lines
271 }271 }
272 chip->iobase_phys = pci_resource_start(pci, 0);272 chip->iobase_phys = pci_resource_start(pci, 0);
273 chip->iobase_virt =273 chip->iobase_virt =
274 ioremap_nocache(chip->iobase_phys,274 ioremap(chip->iobase_phys,
275 pci_resource_len(pci, 0));275 pci_resource_len(pci, 0));
276 276
277 if (chip->iobase_virt == NULL) {277 if (chip->iobase_virt == NULL) {
sound/pci/cs46xx/cs46xx_lib.c+1−1
@@ -3983,7 +3983,7 @@ int snd_cs46xx_create(struct snd_card *card, · 3982 unmodified lines
3983 snd_cs46xx_free(chip);3983 snd_cs46xx_free(chip);
3984 return -EBUSY;3984 return -EBUSY;
3985 }3985 }
3986 region->remap_addr = ioremap_nocache(region->base, region->size);3986 region->remap_addr = ioremap(region->base, region->size);
3987 if (region->remap_addr == NULL) {3987 if (region->remap_addr == NULL) {
3988 dev_err(chip->card->dev,3988 dev_err(chip->card->dev,
3989 "%s ioremap problem\n", region->name);3989 "%s ioremap problem\n", region->name);
sound/pci/echoaudio/echoaudio.c+1−1
@@ -1929,7 +1929,7 @@ static int snd_echo_create(struct snd_card *card, · 1928 unmodified lines
1929 return -EBUSY;1929 return -EBUSY;
1930 }1930 }
1931 chip->dsp_registers = (volatile u32 __iomem *)1931 chip->dsp_registers = (volatile u32 __iomem *)
1932 ioremap_nocache(chip->dsp_registers_phys, sz);1932 ioremap(chip->dsp_registers_phys, sz);
1933 if (!chip->dsp_registers) {1933 if (!chip->dsp_registers) {
1934 dev_err(chip->card->dev, "ioremap failed\n");1934 dev_err(chip->card->dev, "ioremap failed\n");
1935 snd_echo_free(chip);1935 snd_echo_free(chip);
sound/pci/nm256/nm256.c+3−3
@@ -1353,7 +1353,7 @@ snd_nm256_peek_for_sig(struct nm256 *chip) · 1352 unmodified lines
1353 unsigned long pointer_found = chip->buffer_end - 0x1400;1353 unsigned long pointer_found = chip->buffer_end - 0x1400;
1354 u32 sig;1354 u32 sig;
1355 1355
1356 temp = ioremap_nocache(chip->buffer_addr + chip->buffer_end - 0x400, 16);1356 temp = ioremap(chip->buffer_addr + chip->buffer_end - 0x400, 16);
1357 if (temp == NULL) {1357 if (temp == NULL) {
1358 dev_err(chip->card->dev,1358 dev_err(chip->card->dev,
1359 "Unable to scan for card signature in video RAM\n");1359 "Unable to scan for card signature in video RAM\n");
@@ -1518,7 +1518,7 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci, · 158 unmodified lines
1518 err = -EBUSY;1518 err = -EBUSY;
1519 goto __error;1519 goto __error;
1520 }1520 }
1521 chip->cport = ioremap_nocache(chip->cport_addr, NM_PORT2_SIZE);1521 chip->cport = ioremap(chip->cport_addr, NM_PORT2_SIZE);
1522 if (chip->cport == NULL) {1522 if (chip->cport == NULL) {
1523 dev_err(card->dev, "unable to map control port %lx\n",1523 dev_err(card->dev, "unable to map control port %lx\n",
1524 chip->cport_addr);1524 chip->cport_addr);
@@ -1589,7 +1589,7 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci, · 64 unmodified lines
1589 err = -EBUSY;1589 err = -EBUSY;
1590 goto __error;1590 goto __error;
1591 }1591 }
1592 chip->buffer = ioremap_nocache(chip->buffer_addr, chip->buffer_size);1592 chip->buffer = ioremap(chip->buffer_addr, chip->buffer_size);
1593 if (chip->buffer == NULL) {1593 if (chip->buffer == NULL) {
1594 err = -ENOMEM;1594 err = -ENOMEM;
1595 dev_err(card->dev, "unable to map ring buffer at %lx\n",1595 dev_err(card->dev, "unable to map ring buffer at %lx\n",
sound/pci/rme32.c+1−1
@@ -1344,7 +1344,7 @@ static int snd_rme32_create(struct rme32 *rme32) · 1343 unmodified lines
1344 return err;1344 return err;
1345 rme32->port = pci_resource_start(rme32->pci, 0);1345 rme32->port = pci_resource_start(rme32->pci, 0);
1346 1346
1347 rme32->iobase = ioremap_nocache(rme32->port, RME32_IO_SIZE);1347 rme32->iobase = ioremap(rme32->port, RME32_IO_SIZE);
1348 if (!rme32->iobase) {1348 if (!rme32->iobase) {
1349 dev_err(rme32->card->dev,1349 dev_err(rme32->card->dev,
1350 "unable to remap memory region 0x%lx-0x%lx\n",1350 "unable to remap memory region 0x%lx-0x%lx\n",
sound/pci/rme96.c+1−1
@@ -1619,7 +1619,7 @@ snd_rme96_create(struct rme96 *rme96) · 1618 unmodified lines
1619 return err;1619 return err;
1620 rme96->port = pci_resource_start(rme96->pci, 0);1620 rme96->port = pci_resource_start(rme96->pci, 0);
1621 1621
1622 rme96->iobase = ioremap_nocache(rme96->port, RME96_IO_SIZE);1622 rme96->iobase = ioremap(rme96->port, RME96_IO_SIZE);
1623 if (!rme96->iobase) {1623 if (!rme96->iobase) {
1624 dev_err(rme96->card->dev,1624 dev_err(rme96->card->dev,
1625 "unable to remap memory region 0x%lx-0x%lx\n",1625 "unable to remap memory region 0x%lx-0x%lx\n",
sound/pci/rme9652/hdsp.c+1−1
@@ -5220,7 +5220,7 @@ static int snd_hdsp_create(struct snd_card *card, · 5219 unmodified lines
5220 if ((err = pci_request_regions(pci, "hdsp")) < 0)5220 if ((err = pci_request_regions(pci, "hdsp")) < 0)
5221 return err;5221 return err;
5222 hdsp->port = pci_resource_start(pci, 0);5222 hdsp->port = pci_resource_start(pci, 0);
5223 if ((hdsp->iobase = ioremap_nocache(hdsp->port, HDSP_IO_EXTENT)) == NULL) {5223 if ((hdsp->iobase = ioremap(hdsp->port, HDSP_IO_EXTENT)) == NULL) {
5224 dev_err(hdsp->card->dev, "unable to remap region 0x%lx-0x%lx\n",5224 dev_err(hdsp->card->dev, "unable to remap region 0x%lx-0x%lx\n",
5225 hdsp->port, hdsp->port + HDSP_IO_EXTENT - 1);5225 hdsp->port, hdsp->port + HDSP_IO_EXTENT - 1);
5226 return -EBUSY;5226 return -EBUSY;
sound/pci/rme9652/hdspm.c+1−1
@@ -6594,7 +6594,7 @@ static int snd_hdspm_create(struct snd_card *card, · 6593 unmodified lines
6594 dev_dbg(card->dev, "grabbed memory region 0x%lx-0x%lx\n",6594 dev_dbg(card->dev, "grabbed memory region 0x%lx-0x%lx\n",
6595 hdspm->port, hdspm->port + io_extent - 1);6595 hdspm->port, hdspm->port + io_extent - 1);
6596 6596
6597 hdspm->iobase = ioremap_nocache(hdspm->port, io_extent);6597 hdspm->iobase = ioremap(hdspm->port, io_extent);
6598 if (!hdspm->iobase) {6598 if (!hdspm->iobase) {
6599 dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n",6599 dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n",
6600 hdspm->port, hdspm->port + io_extent - 1);6600 hdspm->port, hdspm->port + io_extent - 1);
sound/pci/rme9652/rme9652.c+1−1
@@ -2466,7 +2466,7 @@ static int snd_rme9652_create(struct snd_card *card, · 2465 unmodified lines
2466 if ((err = pci_request_regions(pci, "rme9652")) < 0)2466 if ((err = pci_request_regions(pci, "rme9652")) < 0)
2467 return err;2467 return err;
2468 rme9652->port = pci_resource_start(pci, 0);2468 rme9652->port = pci_resource_start(pci, 0);
2469 rme9652->iobase = ioremap_nocache(rme9652->port, RME9652_IO_EXTENT);2469 rme9652->iobase = ioremap(rme9652->port, RME9652_IO_EXTENT);
2470 if (rme9652->iobase == NULL) {2470 if (rme9652->iobase == NULL) {
2471 dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n",2471 dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n",
2472 rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1);2472 rme9652->port, rme9652->port + RME9652_IO_EXTENT - 1);
sound/pci/sis7019.c+1−1
@@ -1334,7 +1334,7 @@ static int sis_chip_create(struct snd_card *card, · 1333 unmodified lines
1334 }1334 }
1335 1335
1336 rc = -EIO;1336 rc = -EIO;
1337 sis->ioaddr = ioremap_nocache(pci_resource_start(pci, 1), 0x4000);1337 sis->ioaddr = ioremap(pci_resource_start(pci, 1), 0x4000);
1338 if (!sis->ioaddr) {1338 if (!sis->ioaddr) {
1339 dev_err(&pci->dev, "unable to remap MMIO, aborting\n");1339 dev_err(&pci->dev, "unable to remap MMIO, aborting\n");
1340 goto error_out_cleanup;1340 goto error_out_cleanup;
sound/pci/ymfpci/ymfpci_main.c+1−1
@@ -2373,7 +2373,7 @@ int snd_ymfpci_create(struct snd_card *card, · 2372 unmodified lines
2373 chip->device_id = pci->device;2373 chip->device_id = pci->device;
2374 chip->rev = pci->revision;2374 chip->rev = pci->revision;
2375 chip->reg_area_phys = pci_resource_start(pci, 0);2375 chip->reg_area_phys = pci_resource_start(pci, 0);
2376 chip->reg_area_virt = ioremap_nocache(chip->reg_area_phys, 0x8000);2376 chip->reg_area_virt = ioremap(chip->reg_area_phys, 0x8000);
2377 pci_set_master(pci);2377 pci_set_master(pci);
2378 chip->src441_used = -1;2378 chip->src441_used = -1;
2379 2379
sound/soc/au1x/ac97c.c+1−1
@@ -248,7 +248,7 @@ static int au1xac97c_drvprobe(struct platform_device *pdev) · 247 unmodified lines
248 pdev->name))248 pdev->name))
249 return -EBUSY;249 return -EBUSY;
250 250
251 ctx->mmio = devm_ioremap_nocache(&pdev->dev, iores->start,251 ctx->mmio = devm_ioremap(&pdev->dev, iores->start,
252 resource_size(iores));252 resource_size(iores));
253 if (!ctx->mmio)253 if (!ctx->mmio)
254 return -EBUSY;254 return -EBUSY;
sound/soc/au1x/i2sc.c+1−1
@@ -248,7 +248,7 @@ static int au1xi2s_drvprobe(struct platform_device *pdev) · 247 unmodified lines
248 pdev->name))248 pdev->name))
249 return -EBUSY;249 return -EBUSY;
250 250
251 ctx->mmio = devm_ioremap_nocache(&pdev->dev, iores->start,251 ctx->mmio = devm_ioremap(&pdev->dev, iores->start,
252 resource_size(iores));252 resource_size(iores));
253 if (!ctx->mmio)253 if (!ctx->mmio)
254 return -EBUSY;254 return -EBUSY;
sound/soc/intel/atom/sst/sst_acpi.c+5−5
@@ -165,7 +165,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) · 164 unmodified lines
165 ctx->iram_base = rsrc->start + ctx->pdata->res_info->iram_offset;165 ctx->iram_base = rsrc->start + ctx->pdata->res_info->iram_offset;
166 ctx->iram_end = ctx->iram_base + ctx->pdata->res_info->iram_size - 1;166 ctx->iram_end = ctx->iram_base + ctx->pdata->res_info->iram_size - 1;
167 dev_info(ctx->dev, "IRAM base: %#x", ctx->iram_base);167 dev_info(ctx->dev, "IRAM base: %#x", ctx->iram_base);
168 ctx->iram = devm_ioremap_nocache(ctx->dev, ctx->iram_base,168 ctx->iram = devm_ioremap(ctx->dev, ctx->iram_base,
169 ctx->pdata->res_info->iram_size);169 ctx->pdata->res_info->iram_size);
170 if (!ctx->iram) {170 if (!ctx->iram) {
171 dev_err(ctx->dev, "unable to map IRAM\n");171 dev_err(ctx->dev, "unable to map IRAM\n");
@@ -175,7 +175,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) · 3 unmodified lines
175 ctx->dram_base = rsrc->start + ctx->pdata->res_info->dram_offset;175 ctx->dram_base = rsrc->start + ctx->pdata->res_info->dram_offset;
176 ctx->dram_end = ctx->dram_base + ctx->pdata->res_info->dram_size - 1;176 ctx->dram_end = ctx->dram_base + ctx->pdata->res_info->dram_size - 1;
177 dev_info(ctx->dev, "DRAM base: %#x", ctx->dram_base);177 dev_info(ctx->dev, "DRAM base: %#x", ctx->dram_base);
178 ctx->dram = devm_ioremap_nocache(ctx->dev, ctx->dram_base,178 ctx->dram = devm_ioremap(ctx->dev, ctx->dram_base,
179 ctx->pdata->res_info->dram_size);179 ctx->pdata->res_info->dram_size);
180 if (!ctx->dram) {180 if (!ctx->dram) {
181 dev_err(ctx->dev, "unable to map DRAM\n");181 dev_err(ctx->dev, "unable to map DRAM\n");
@@ -184,7 +184,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) · 2 unmodified lines
184 184
185 ctx->shim_phy_add = rsrc->start + ctx->pdata->res_info->shim_offset;185 ctx->shim_phy_add = rsrc->start + ctx->pdata->res_info->shim_offset;
186 dev_info(ctx->dev, "SHIM base: %#x", ctx->shim_phy_add);186 dev_info(ctx->dev, "SHIM base: %#x", ctx->shim_phy_add);
187 ctx->shim = devm_ioremap_nocache(ctx->dev, ctx->shim_phy_add,187 ctx->shim = devm_ioremap(ctx->dev, ctx->shim_phy_add,
188 ctx->pdata->res_info->shim_size);188 ctx->pdata->res_info->shim_size);
189 if (!ctx->shim) {189 if (!ctx->shim) {
190 dev_err(ctx->dev, "unable to map SHIM\n");190 dev_err(ctx->dev, "unable to map SHIM\n");
@@ -197,7 +197,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) · 6 unmodified lines
197 /* Get mailbox addr */197 /* Get mailbox addr */
198 ctx->mailbox_add = rsrc->start + ctx->pdata->res_info->mbox_offset;198 ctx->mailbox_add = rsrc->start + ctx->pdata->res_info->mbox_offset;
199 dev_info(ctx->dev, "Mailbox base: %#x", ctx->mailbox_add);199 dev_info(ctx->dev, "Mailbox base: %#x", ctx->mailbox_add);
200 ctx->mailbox = devm_ioremap_nocache(ctx->dev, ctx->mailbox_add,200 ctx->mailbox = devm_ioremap(ctx->dev, ctx->mailbox_add,
201 ctx->pdata->res_info->mbox_size);201 ctx->pdata->res_info->mbox_size);
202 if (!ctx->mailbox) {202 if (!ctx->mailbox) {
203 dev_err(ctx->dev, "unable to map mailbox\n");203 dev_err(ctx->dev, "unable to map mailbox\n");
@@ -216,7 +216,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) · 12 unmodified lines
216 ctx->ddr_base = rsrc->start;216 ctx->ddr_base = rsrc->start;
217 ctx->ddr_end = rsrc->end;217 ctx->ddr_end = rsrc->end;
218 dev_info(ctx->dev, "DDR base: %#x", ctx->ddr_base);218 dev_info(ctx->dev, "DDR base: %#x", ctx->ddr_base);
219 ctx->ddr = devm_ioremap_nocache(ctx->dev, ctx->ddr_base,219 ctx->ddr = devm_ioremap(ctx->dev, ctx->ddr_base,
220 resource_size(rsrc));220 resource_size(rsrc));
221 if (!ctx->ddr) {221 if (!ctx->ddr) {
222 dev_err(ctx->dev, "unable to map DDR\n");222 dev_err(ctx->dev, "unable to map DDR\n");
sound/soc/sh/fsi.c+1−1
@@ -1955,7 +1955,7 @@ static int fsi_probe(struct platform_device *pdev) · 1954 unmodified lines
1955 if (!master)1955 if (!master)
1956 return -ENOMEM;1956 return -ENOMEM;
1957 1957
1958 master->base = devm_ioremap_nocache(&pdev->dev,1958 master->base = devm_ioremap(&pdev->dev,
1959 res->start, resource_size(res));1959 res->start, resource_size(res));
1960 if (!master->base) {1960 if (!master->base) {
1961 dev_err(&pdev->dev, "Unable to ioremap FSI registers.\n");1961 dev_err(&pdev->dev, "Unable to ioremap FSI registers.\n");
sound/x86/intel_hdmi_audio.c+1−1
@@ -1755,7 +1755,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) · 1754 unmodified lines
1755 __func__, (unsigned int)res_mmio->start,1755 __func__, (unsigned int)res_mmio->start,
1756 (unsigned int)res_mmio->end);1756 (unsigned int)res_mmio->end);
1757 1757
1758 card_ctx->mmio_start = ioremap_nocache(res_mmio->start,1758 card_ctx->mmio_start = ioremap(res_mmio->start,
1759 (size_t)(resource_size(res_mmio)));1759 (size_t)(resource_size(res_mmio)));
1760 if (!card_ctx->mmio_start) {1760 if (!card_ctx->mmio_start) {
1761 dev_err(&pdev->dev, "Could not get ioremap\n");1761 dev_err(&pdev->dev, "Could not get ioremap\n");
tools/testing/nvdimm/Kbuild+1−2
@@ -1,10 +1,9 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2ldflags-y += --wrap=ioremap_wc2ldflags-y += --wrap=ioremap_wc
3ldflags-y += --wrap=memremap3ldflags-y += --wrap=memremap
4ldflags-y += --wrap=devm_ioremap_nocache4ldflags-y += --wrap=devm_ioremap
5ldflags-y += --wrap=devm_memremap5ldflags-y += --wrap=devm_memremap
6ldflags-y += --wrap=devm_memunmap6ldflags-y += --wrap=devm_memunmap
7ldflags-y += --wrap=ioremap_nocache
8ldflags-y += --wrap=ioremap7ldflags-y += --wrap=ioremap
9ldflags-y += --wrap=iounmap8ldflags-y += --wrap=iounmap
10ldflags-y += --wrap=memunmap9ldflags-y += --wrap=memunmap
tools/testing/nvdimm/test/iomap.c+3−9
@@ -73,7 +73,7 @@ void __iomem *__nfit_test_ioremap(resource_size_t offset, unsigned long size, · 72 unmodified lines
73 return fallback_fn(offset, size);73 return fallback_fn(offset, size);
74}74}
75 75
76void __iomem *__wrap_devm_ioremap_nocache(struct device *dev,76void __iomem *__wrap_devm_ioremap(struct device *dev,
77 resource_size_t offset, unsigned long size)77 resource_size_t offset, unsigned long size)
78{78{
79 struct nfit_test_resource *nfit_res = get_nfit_res(offset);79 struct nfit_test_resource *nfit_res = get_nfit_res(offset);
@@ -81,9 +81,9 @@ void __iomem *__wrap_devm_ioremap_nocache(struct device *dev, · 1 unmodified line
81 if (nfit_res)81 if (nfit_res)
82 return (void __iomem *) nfit_res->buf + offset82 return (void __iomem *) nfit_res->buf + offset
83 - nfit_res->res.start;83 - nfit_res->res.start;
84 return devm_ioremap_nocache(dev, offset, size);84 return devm_ioremap(dev, offset, size);
85}85}
86EXPORT_SYMBOL(__wrap_devm_ioremap_nocache);86EXPORT_SYMBOL(__wrap_devm_ioremap);
87 87
88void *__wrap_devm_memremap(struct device *dev, resource_size_t offset,88void *__wrap_devm_memremap(struct device *dev, resource_size_t offset,
89 size_t size, unsigned long flags)89 size_t size, unsigned long flags)
@@ -187,12 +187,6 @@ void __wrap_devm_memunmap(struct device *dev, void *addr) · 97 unmodified lines
187}187}
188EXPORT_SYMBOL(__wrap_devm_memunmap);188EXPORT_SYMBOL(__wrap_devm_memunmap);
189 189
190void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size)
191{
192 return __nfit_test_ioremap(offset, size, ioremap_nocache);
193}
194EXPORT_SYMBOL(__wrap_ioremap_nocache);
195
196void __iomem *__wrap_ioremap(resource_size_t offset, unsigned long size)190void __iomem *__wrap_ioremap(resource_size_t offset, unsigned long size)
197{191{
198 return __nfit_test_ioremap(offset, size, ioremap);192 return __nfit_test_ioremap(offset, size, ioremap);
tools/testing/nvdimm/test/nfit_test.h+0−2
@@ -207,8 +207,6 @@ typedef struct nfit_test_resource *(*nfit_test_lookup_fn)(resource_size_t); · 206 unmodified lines
207typedef union acpi_object *(*nfit_test_evaluate_dsm_fn)(acpi_handle handle,207typedef union acpi_object *(*nfit_test_evaluate_dsm_fn)(acpi_handle handle,
208 const guid_t *guid, u64 rev, u64 func,208 const guid_t *guid, u64 rev, u64 func,
209 union acpi_object *argv4);209 union acpi_object *argv4);
210void __iomem *__wrap_ioremap_nocache(resource_size_t offset,
211 unsigned long size);
212void __wrap_iounmap(volatile void __iomem *addr);210void __wrap_iounmap(volatile void __iomem *addr);
213void nfit_test_setup(nfit_test_lookup_fn lookup,211void nfit_test_setup(nfit_test_lookup_fn lookup,
214 nfit_test_evaluate_dsm_fn evaluate);212 nfit_test_evaluate_dsm_fn evaluate);