ALSA: Include linux/io.h instead of asm/io.h

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

ALSA: Include linux/io.h instead of asm/io.h

Nowadays it's recommended. Replace all in a shot.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai 11 years ago 6cbbfe1c 37419584

+100 -111

100 changed files

expand all collapse all

include

sound

emu10k1.h

gus.h

sb.h

sound

aoa

soundbus

i2sbus

control.c

pcm.c

core

memory.c

pcm_memory.c

pcm_native.c

drivers

mpu401

mpu401_uart.c

opl3

opl3_lib.c

opl4

opl4_lib.c

opl4_synth.c

pcsp

pcsp_input.c

pcsp_lib.c

serial-u16550.c

vx_core.c

i2c

other

ak4xxx-adda.c

isa

ad1816a

ad1816a_lib.c

azt2320.c

cs423x

cs4236_lib.c

es1688

es1688_lib.c

es18xx.c

opl3sa2.c

opti9xx

miro.c

opti92x-ad1848.c

emu8000.c

sb16_main.c

sb8_main.c

sb8_midi.c

sb_common.c

sb_mixer.c

wavefront

wavefront_fx.c

wavefront_midi.c

wavefront_synth.c

wss

wss_lib.c

parisc

harmony.c

pci

ad1889.c

ali5451

ali5451.c

als300.c

als4000.c

atiixp.c

atiixp_modem.c

au88x0

au88x0.h

aw2

aw2-saa7146.c

azt3328.c

bt87x.c

ca0106

ca0106_mixer.c

ca0106_proc.c

cmipci.c

cs4281.c

cs46xx

cs46xx_lib.c

dsp_spos.c

dsp_spos_scb_lib.c

cs5535audio

cs5535audio.c

echoaudio

darla20.c

darla24.c

echo3g.c

gina20.c

gina24.c

indigo.c

indigodj.c

indigoio.c

layla20.c

layla24.c

mia.c

mona.c

ens1370.c

es1938.c

es1968.c

ice1712

ak4xxx.c

intel8x0.c

intel8x0m.c

korg1212

korg1212.c

maestro3.c

mixart

mixart_core.c

mixart_hwdep.c

nm256

nm256.c

oxygen

oxygen_io.c

pcxhr

pcxhr_core.c

pcxhr_hwdep.c

riptide

riptide.c

rme32.c

rme96.c

rme9652

hdsp.c

hdspm.c

rme9652.c

sonicvibes.c

trident

trident_main.c

trident_memory.c

via82xx.c

via82xx_modem.c

vx222

vx222_ops.c

ymfpci

ymfpci_main.c

ppc

awacs.c

beep.c

burgundy.c

pmac.c

tumbler.c

aica.c

sparc

amd7930.c

+1 -1

include/sound/emu10k1.h

reviewed

··· 33 33 #include <linux/interrupt.h> 34 34 #include <linux/mutex.h> 35 35 #include <linux/firmware.h> 36 36 + #include <linux/io.h> 36 37 37 37 - #include <asm/io.h> 38 38 #include <uapi/sound/emu10k1.h> 39 39 40 40 /* ------------------- DEFINES -------------------- */

+1 -1

include/sound/gus.h

reviewed

··· 27 27 #include <sound/timer.h> 28 28 #include <sound/seq_midi_emul.h> 29 29 #include <sound/seq_device.h> 30 30 - #include <asm/io.h> 30 30 + #include <linux/io.h> 31 31 32 32 /* IO ports */ 33 33

+1 -1

include/sound/sb.h

reviewed

··· 25 25 #include <sound/pcm.h> 26 26 #include <sound/rawmidi.h> 27 27 #include <linux/interrupt.h> 28 28 - #include <asm/io.h> 28 28 + #include <linux/io.h> 29 29 30 30 enum sb_hw_type { 31 31 SB_HW_AUTO,

+1 -1

sound/aoa/soundbus/i2sbus/control.c

reviewed

··· 9 9 #include <linux/kernel.h> 10 10 #include <linux/delay.h> 11 11 #include <linux/slab.h> 12 12 + #include <linux/io.h> 12 13 13 13 - #include <asm/io.h> 14 14 #include <asm/prom.h> 15 15 #include <asm/macio.h> 16 16 #include <asm/pmac_feature.h>

+1 -1

sound/aoa/soundbus/i2sbus/pcm.c

reviewed

··· 6 6 * GPL v2, can be found in COPYING. 7 7 */ 8 8 9 9 - #include <asm/io.h> 9 9 + #include <linux/io.h> 10 10 #include <linux/delay.h> 11 11 #include <linux/slab.h> 12 12 #include <sound/core.h>

+1 -1

sound/core/memory.c

reviewed

··· 21 21 */ 22 22 23 23 #include <linux/export.h> 24 24 - #include <asm/io.h> 24 24 + #include <linux/io.h> 25 25 #include <asm/uaccess.h> 26 26 #include <sound/core.h> 27 27

+1 -1

sound/core/pcm_memory.c

reviewed

··· 19 19 * 20 20 */ 21 21 22 22 - #include <asm/io.h> 22 22 + #include <linux/io.h> 23 23 #include <linux/time.h> 24 24 #include <linux/init.h> 25 25 #include <linux/slab.h>

+1 -1

sound/core/pcm_native.c

reviewed

··· 26 26 #include <linux/time.h> 27 27 #include <linux/pm_qos.h> 28 28 #include <linux/aio.h> 29 29 + #include <linux/io.h> 29 30 #include <linux/dma-mapping.h> 30 31 #include <sound/core.h> 31 32 #include <sound/control.h> ··· 35 34 #include <sound/pcm_params.h> 36 35 #include <sound/timer.h> 37 36 #include <sound/minors.h> 38 38 - #include <asm/io.h> 39 37 40 38 /* 41 39 * Compatibility

+1 -1

sound/drivers/mpu401/mpu401_uart.c

reviewed

··· 28 28 * 29 29 */ 30 30 31 31 - #include <asm/io.h> 31 31 + #include <linux/io.h> 32 32 #include <linux/delay.h> 33 33 #include <linux/init.h> 34 34 #include <linux/slab.h>

+1 -1

sound/drivers/opl3/opl3_lib.c

reviewed

··· 24 24 */ 25 25 26 26 #include <sound/opl3.h> 27 27 - #include <asm/io.h> 27 27 + #include <linux/io.h> 28 28 #include <linux/delay.h> 29 29 #include <linux/module.h> 30 30 #include <linux/init.h>

+1 -1

sound/drivers/opl4/opl4_lib.c

reviewed

··· 23 23 #include <linux/slab.h> 24 24 #include <linux/init.h> 25 25 #include <linux/module.h> 26 26 - #include <asm/io.h> 26 26 + #include <linux/io.h> 27 27 28 28 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>"); 29 29 MODULE_DESCRIPTION("OPL4 driver");

+1 -1

sound/drivers/opl4/opl4_synth.c

reviewed

··· 33 33 34 34 #include "opl4_local.h" 35 35 #include <linux/delay.h> 36 36 - #include <asm/io.h> 36 36 + #include <linux/io.h> 37 37 #include <sound/asoundef.h> 38 38 39 39 /* GM2 controllers */

+1 -1

sound/drivers/pcsp/pcsp_input.c

reviewed

··· 14 14 15 15 #include <linux/init.h> 16 16 #include <linux/input.h> 17 17 - #include <asm/io.h> 17 17 + #include <linux/io.h> 18 18 #include "pcsp.h" 19 19 #include "pcsp_input.h" 20 20

+1 -1

sound/drivers/pcsp/pcsp_lib.c

reviewed

··· 10 10 #include <linux/gfp.h> 11 11 #include <linux/moduleparam.h> 12 12 #include <linux/interrupt.h> 13 13 + #include <linux/io.h> 13 14 #include <sound/pcm.h> 14 14 - #include <asm/io.h> 15 15 #include "pcsp.h" 16 16 17 17 static bool nforce_wa;

+1 -2

sound/drivers/serial-u16550.c

reviewed

··· 37 37 #include <linux/slab.h> 38 38 #include <linux/ioport.h> 39 39 #include <linux/module.h> 40 40 + #include <linux/io.h> 40 41 #include <sound/core.h> 41 42 #include <sound/rawmidi.h> 42 43 #include <sound/initval.h> 43 44 44 45 #include <linux/serial_reg.h> 45 46 #include <linux/jiffies.h> 46 46 - 47 47 - #include <asm/io.h> 48 47 49 48 MODULE_DESCRIPTION("MIDI serial u16550"); 50 49 MODULE_LICENSE("GPL");

+1 -1

sound/drivers/vx/vx_core.c

reviewed

··· 27 27 #include <linux/device.h> 28 28 #include <linux/firmware.h> 29 29 #include <linux/module.h> 30 30 + #include <linux/io.h> 30 31 #include <sound/core.h> 31 32 #include <sound/pcm.h> 32 33 #include <sound/asoundef.h> 33 34 #include <sound/info.h> 34 34 - #include <asm/io.h> 35 35 #include <sound/vx_core.h> 36 36 #include "vx_cmd.h" 37 37

+1 -1

sound/i2c/other/ak4xxx-adda.c

reviewed

··· 21 21 * 22 22 */ 23 23 24 24 - #include <asm/io.h> 24 24 + #include <linux/io.h> 25 25 #include <linux/delay.h> 26 26 #include <linux/interrupt.h> 27 27 #include <linux/init.h>

+1 -1

sound/isa/ad1816a/ad1816a_lib.c

reviewed

··· 22 22 #include <linux/interrupt.h> 23 23 #include <linux/slab.h> 24 24 #include <linux/ioport.h> 25 25 + #include <linux/io.h> 25 26 #include <sound/core.h> 26 27 #include <sound/tlv.h> 27 28 #include <sound/ad1816a.h> 28 29 29 29 - #include <asm/io.h> 30 30 #include <asm/dma.h> 31 31 32 32 static inline int snd_ad1816a_busy_wait(struct snd_ad1816a *chip)

+1 -1

sound/isa/azt2320.c

reviewed

··· 29 29 activation method (full-duplex audio!). 30 30 */ 31 31 32 32 - #include <asm/io.h> 32 32 + #include <linux/io.h> 33 33 #include <linux/delay.h> 34 34 #include <linux/init.h> 35 35 #include <linux/time.h>

+1 -1

sound/isa/cs423x/cs4236_lib.c

reviewed

··· 79 79 * 80 80 */ 81 81 82 82 - #include <asm/io.h> 82 82 + #include <linux/io.h> 83 83 #include <linux/delay.h> 84 84 #include <linux/init.h> 85 85 #include <linux/time.h>

+1 -1

sound/isa/es1688/es1688_lib.c

reviewed

··· 25 25 #include <linux/slab.h> 26 26 #include <linux/ioport.h> 27 27 #include <linux/module.h> 28 28 + #include <linux/io.h> 28 29 #include <sound/core.h> 29 30 #include <sound/es1688.h> 30 31 #include <sound/initval.h> 31 32 32 32 - #include <asm/io.h> 33 33 #include <asm/dma.h> 34 34 35 35 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");

+1 -1

sound/isa/es18xx.c

reviewed

··· 84 84 #include <linux/isapnp.h> 85 85 #include <linux/module.h> 86 86 #include <linux/delay.h> 87 87 + #include <linux/io.h> 87 88 88 88 - #include <asm/io.h> 89 89 #include <asm/dma.h> 90 90 #include <sound/core.h> 91 91 #include <sound/control.h>

+1 -2

sound/isa/opl3sa2.c

reviewed

··· 26 26 #include <linux/pm.h> 27 27 #include <linux/pnp.h> 28 28 #include <linux/module.h> 29 29 + #include <linux/io.h> 29 30 #include <sound/core.h> 30 31 #include <sound/wss.h> 31 32 #include <sound/mpu401.h> 32 33 #include <sound/opl3.h> 33 34 #include <sound/initval.h> 34 35 #include <sound/tlv.h> 35 35 - 36 36 - #include <asm/io.h> 37 36 38 37 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); 39 38 MODULE_DESCRIPTION("Yamaha OPL3SA2+");

+1 -1

sound/isa/opti9xx/miro.c

reviewed

··· 29 29 #include <linux/delay.h> 30 30 #include <linux/ioport.h> 31 31 #include <linux/module.h> 32 32 - #include <asm/io.h> 32 32 + #include <linux/io.h> 33 33 #include <asm/dma.h> 34 34 #include <sound/core.h> 35 35 #include <sound/wss.h>

+1 -1

sound/isa/opti9xx/opti92x-ad1848.c

reviewed

··· 29 29 #include <linux/delay.h> 30 30 #include <linux/pnp.h> 31 31 #include <linux/module.h> 32 32 - #include <asm/io.h> 32 32 + #include <linux/io.h> 33 33 #include <asm/dma.h> 34 34 #include <sound/core.h> 35 35 #include <sound/tlv.h>

+1 -1

sound/isa/sb/emu8000.c

reviewed

··· 26 26 #include <linux/ioport.h> 27 27 #include <linux/export.h> 28 28 #include <linux/delay.h> 29 29 + #include <linux/io.h> 29 30 #include <sound/core.h> 30 31 #include <sound/emu8000.h> 31 32 #include <sound/emu8000_reg.h> 32 32 - #include <asm/io.h> 33 33 #include <asm/uaccess.h> 34 34 #include <linux/init.h> 35 35 #include <sound/control.h>

+1 -1

sound/isa/sb/sb16_main.c

reviewed

··· 33 33 * 34 34 */ 35 35 36 36 - #include <asm/io.h> 36 36 + #include <linux/io.h> 37 37 #include <asm/dma.h> 38 38 #include <linux/init.h> 39 39 #include <linux/time.h>

+1 -1

sound/isa/sb/sb8_main.c

reviewed

··· 30 30 * Cleaned up and rewrote lowlevel routines. 31 31 */ 32 32 33 33 - #include <asm/io.h> 33 33 + #include <linux/io.h> 34 34 #include <asm/dma.h> 35 35 #include <linux/init.h> 36 36 #include <linux/time.h>

+1 -1

sound/isa/sb/sb8_midi.c

reviewed

··· 26 26 * Added full duplex UART mode for DSP version 2.0 and later. 27 27 */ 28 28 29 29 - #include <asm/io.h> 29 29 + #include <linux/io.h> 30 30 #include <linux/time.h> 31 31 #include <sound/core.h> 32 32 #include <sound/sb.h>

+1 -1

sound/isa/sb/sb_common.c

reviewed

··· 26 26 #include <linux/slab.h> 27 27 #include <linux/ioport.h> 28 28 #include <linux/module.h> 29 29 + #include <linux/io.h> 29 30 #include <sound/core.h> 30 31 #include <sound/sb.h> 31 32 #include <sound/initval.h> 32 33 33 33 - #include <asm/io.h> 34 34 #include <asm/dma.h> 35 35 36 36 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");

+1 -1

sound/isa/sb/sb_mixer.c

reviewed

··· 19 19 * 20 20 */ 21 21 22 22 - #include <asm/io.h> 22 22 + #include <linux/io.h> 23 23 #include <linux/delay.h> 24 24 #include <linux/time.h> 25 25 #include <sound/core.h>

+1 -1

sound/isa/wavefront/wavefront_fx.c

reviewed

··· 16 16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 17 */ 18 18 19 19 - #include <asm/io.h> 19 19 + #include <linux/io.h> 20 20 #include <linux/init.h> 21 21 #include <linux/time.h> 22 22 #include <linux/wait.h>

+1 -1

sound/isa/wavefront/wavefront_midi.c

reviewed

··· 47 47 * 48 48 */ 49 49 50 50 - #include <asm/io.h> 50 50 + #include <linux/io.h> 51 51 #include <linux/init.h> 52 52 #include <linux/time.h> 53 53 #include <linux/wait.h>

+1 -1

sound/isa/wavefront/wavefront_synth.c

reviewed

··· 20 20 * 21 21 */ 22 22 23 23 - #include <asm/io.h> 23 23 + #include <linux/io.h> 24 24 #include <linux/interrupt.h> 25 25 #include <linux/init.h> 26 26 #include <linux/delay.h>

+1 -1

sound/isa/wss/wss_lib.c

reviewed

··· 31 31 #include <linux/slab.h> 32 32 #include <linux/ioport.h> 33 33 #include <linux/module.h> 34 34 + #include <linux/io.h> 34 35 #include <sound/core.h> 35 36 #include <sound/wss.h> 36 37 #include <sound/pcm_params.h> 37 38 #include <sound/tlv.h> 38 39 39 39 - #include <asm/io.h> 40 40 #include <asm/dma.h> 41 41 #include <asm/irq.h> 42 42

+1 -1

sound/parisc/harmony.c

reviewed

··· 44 44 #include <linux/interrupt.h> 45 45 #include <linux/spinlock.h> 46 46 #include <linux/dma-mapping.h> 47 47 + #include <linux/io.h> 47 48 48 49 #include <sound/core.h> 49 50 #include <sound/pcm.h> ··· 53 52 #include <sound/initval.h> 54 53 #include <sound/info.h> 55 54 56 56 - #include <asm/io.h> 57 55 #include <asm/hardware.h> 58 56 #include <asm/parisc-device.h> 59 57

+1 -2

sound/pci/ad1889.c

reviewed

··· 40 40 #include <linux/compiler.h> 41 41 #include <linux/delay.h> 42 42 #include <linux/module.h> 43 43 + #include <linux/io.h> 43 44 44 45 #include <sound/core.h> 45 46 #include <sound/pcm.h> 46 47 #include <sound/initval.h> 47 48 #include <sound/ac97_codec.h> 48 48 - 49 49 - #include <asm/io.h> 50 49 51 50 #include "ad1889.h" 52 51 #include "ac97/ac97_id.h"

+1 -1

sound/pci/ali5451/ali5451.c

reviewed

··· 25 25 * 26 26 */ 27 27 28 28 - #include <asm/io.h> 28 28 + #include <linux/io.h> 29 29 #include <linux/delay.h> 30 30 #include <linux/interrupt.h> 31 31 #include <linux/init.h>

+1 -2

sound/pci/als300.c

reviewed

··· 37 37 #include <linux/dma-mapping.h> 38 38 #include <linux/interrupt.h> 39 39 #include <linux/slab.h> 40 40 - 41 41 - #include <asm/io.h> 40 40 + #include <linux/io.h> 42 41 43 42 #include <sound/core.h> 44 43 #include <sound/control.h>

+1 -1

sound/pci/als4000.c

reviewed

··· 65 65 * - power management? (card can do voice wakeup according to datasheet!!) 66 66 */ 67 67 68 68 - #include <asm/io.h> 68 68 + #include <linux/io.h> 69 69 #include <linux/init.h> 70 70 #include <linux/pci.h> 71 71 #include <linux/gameport.h>

+1 -1

sound/pci/atiixp.c

reviewed

··· 19 19 * 20 20 */ 21 21 22 22 - #include <asm/io.h> 22 22 + #include <linux/io.h> 23 23 #include <linux/delay.h> 24 24 #include <linux/interrupt.h> 25 25 #include <linux/init.h>

+1 -1

sound/pci/atiixp_modem.c

reviewed

··· 19 19 * 20 20 */ 21 21 22 22 - #include <asm/io.h> 22 22 + #include <linux/io.h> 23 23 #include <linux/delay.h> 24 24 #include <linux/interrupt.h> 25 25 #include <linux/init.h>

+1 -1

sound/pci/au88x0/au88x0.h

reviewed

··· 19 19 20 20 #ifdef __KERNEL__ 21 21 #include <linux/pci.h> 22 22 - #include <asm/io.h> 22 22 + #include <linux/io.h> 23 23 #include <sound/core.h> 24 24 #include <sound/pcm.h> 25 25 #include <sound/rawmidi.h>

+1 -1

sound/pci/aw2/aw2-saa7146.c

reviewed

··· 27 27 #include <linux/pci.h> 28 28 #include <linux/interrupt.h> 29 29 #include <linux/delay.h> 30 30 - #include <asm/io.h> 30 30 + #include <linux/io.h> 31 31 #include <sound/core.h> 32 32 #include <sound/initval.h> 33 33 #include <sound/pcm.h>

+1 -1

sound/pci/azt3328.c

reviewed

··· 179 179 * - use MMIO (memory-mapped I/O)? Slightly faster access, e.g. for gameport. 180 180 */ 181 181 182 182 - #include <asm/io.h> 182 182 + #include <linux/io.h> 183 183 #include <linux/init.h> 184 184 #include <linux/bug.h> /* WARN_ONCE */ 185 185 #include <linux/pci.h>

+1 -1

sound/pci/bt87x.c

reviewed

··· 27 27 #include <linux/slab.h> 28 28 #include <linux/module.h> 29 29 #include <linux/bitops.h> 30 30 - #include <asm/io.h> 30 30 + #include <linux/io.h> 31 31 #include <sound/core.h> 32 32 #include <sound/pcm.h> 33 33 #include <sound/pcm_params.h>

+1 -1

sound/pci/ca0106/ca0106_mixer.c

reviewed

··· 70 70 #include <sound/ac97_codec.h> 71 71 #include <sound/info.h> 72 72 #include <sound/tlv.h> 73 73 - #include <asm/io.h> 73 73 + #include <linux/io.h> 74 74 75 75 #include "ca0106.h" 76 76

+1 -1

sound/pci/ca0106/ca0106_proc.c

reviewed

··· 64 64 #include <linux/init.h> 65 65 #include <linux/interrupt.h> 66 66 #include <linux/moduleparam.h> 67 67 + #include <linux/io.h> 67 68 #include <sound/core.h> 68 69 #include <sound/initval.h> 69 70 #include <sound/pcm.h> 70 71 #include <sound/ac97_codec.h> 71 72 #include <sound/info.h> 72 73 #include <sound/asoundef.h> 73 73 - #include <asm/io.h> 74 74 75 75 #include "ca0106.h" 76 76

+1 -1

sound/pci/cmipci.c

reviewed

··· 20 20 /* Does not work. Warning may block system in capture mode */ 21 21 /* #define USE_VAR48KRATE */ 22 22 23 23 - #include <asm/io.h> 23 23 + #include <linux/io.h> 24 24 #include <linux/delay.h> 25 25 #include <linux/interrupt.h> 26 26 #include <linux/init.h>

+1 -1

sound/pci/cs4281.c

reviewed

··· 19 19 * 20 20 */ 21 21 22 22 - #include <asm/io.h> 22 22 + #include <linux/io.h> 23 23 #include <linux/delay.h> 24 24 #include <linux/interrupt.h> 25 25 #include <linux/init.h>

+1 -2

sound/pci/cs46xx/cs46xx_lib.c

reviewed

··· 57 57 #include <linux/module.h> 58 58 #include <linux/firmware.h> 59 59 #include <linux/vmalloc.h> 60 60 + #include <linux/io.h> 60 61 61 62 #include <sound/core.h> 62 63 #include <sound/control.h> ··· 65 64 #include <sound/pcm.h> 66 65 #include <sound/pcm_params.h> 67 66 #include "cs46xx.h" 68 68 - 69 69 - #include <asm/io.h> 70 67 71 68 #include "cs46xx_lib.h" 72 69 #include "dsp_spos.h"

+1 -1

sound/pci/cs46xx/dsp_spos.c

reviewed

··· 20 20 */ 21 21 22 22 23 23 - #include <asm/io.h> 23 23 + #include <linux/io.h> 24 24 #include <linux/delay.h> 25 25 #include <linux/pm.h> 26 26 #include <linux/init.h>

+1 -1

sound/pci/cs46xx/dsp_spos_scb_lib.c

reviewed

··· 21 21 */ 22 22 23 23 24 24 - #include <asm/io.h> 24 24 + #include <linux/io.h> 25 25 #include <linux/delay.h> 26 26 #include <linux/pm.h> 27 27 #include <linux/init.h>

+1 -1

sound/pci/cs5535audio/cs5535audio.c

reviewed

··· 27 27 #include <linux/pci.h> 28 28 #include <linux/slab.h> 29 29 #include <linux/module.h> 30 30 - #include <asm/io.h> 30 30 + #include <linux/io.h> 31 31 #include <sound/core.h> 32 32 #include <sound/control.h> 33 33 #include <sound/pcm.h>

+1 -1

sound/pci/echoaudio/darla20.c

reviewed

··· 43 43 #include <linux/module.h> 44 44 #include <linux/firmware.h> 45 45 #include <linux/slab.h> 46 46 + #include <linux/io.h> 46 47 #include <sound/core.h> 47 48 #include <sound/info.h> 48 49 #include <sound/control.h> ··· 52 51 #include <sound/pcm_params.h> 53 52 #include <sound/asoundef.h> 54 53 #include <sound/initval.h> 55 55 - #include <asm/io.h> 56 54 #include <linux/atomic.h> 57 55 #include "echoaudio.h" 58 56

+1 -1

sound/pci/echoaudio/darla24.c

reviewed

··· 47 47 #include <linux/module.h> 48 48 #include <linux/firmware.h> 49 49 #include <linux/slab.h> 50 50 + #include <linux/io.h> 50 51 #include <sound/core.h> 51 52 #include <sound/info.h> 52 53 #include <sound/control.h> ··· 56 55 #include <sound/pcm_params.h> 57 56 #include <sound/asoundef.h> 58 57 #include <sound/initval.h> 59 59 - #include <asm/io.h> 60 58 #include <linux/atomic.h> 61 59 #include "echoaudio.h" 62 60

+1 -1

sound/pci/echoaudio/echo3g.c

reviewed

··· 54 54 #include <linux/module.h> 55 55 #include <linux/firmware.h> 56 56 #include <linux/slab.h> 57 57 + #include <linux/io.h> 57 58 #include <sound/core.h> 58 59 #include <sound/info.h> 59 60 #include <sound/control.h> ··· 64 63 #include <sound/asoundef.h> 65 64 #include <sound/initval.h> 66 65 #include <sound/rawmidi.h> 67 67 - #include <asm/io.h> 68 66 #include <linux/atomic.h> 69 67 #include "echoaudio.h" 70 68

+1 -1

sound/pci/echoaudio/gina20.c

reviewed

+1 -1

sound/pci/echoaudio/gina24.c

reviewed

··· 53 53 #include <linux/module.h> 54 54 #include <linux/firmware.h> 55 55 #include <linux/slab.h> 56 56 + #include <linux/io.h> 56 57 #include <sound/core.h> 57 58 #include <sound/info.h> 58 59 #include <sound/control.h> ··· 62 61 #include <sound/pcm_params.h> 63 62 #include <sound/asoundef.h> 64 63 #include <sound/initval.h> 65 65 - #include <asm/io.h> 66 64 #include <linux/atomic.h> 67 65 #include "echoaudio.h" 68 66

+1 -1

sound/pci/echoaudio/indigo.c

reviewed

··· 45 45 #include <linux/module.h> 46 46 #include <linux/firmware.h> 47 47 #include <linux/slab.h> 48 48 + #include <linux/io.h> 48 49 #include <sound/core.h> 49 50 #include <sound/info.h> 50 51 #include <sound/control.h> ··· 54 53 #include <sound/pcm_params.h> 55 54 #include <sound/asoundef.h> 56 55 #include <sound/initval.h> 57 57 - #include <asm/io.h> 58 56 #include <linux/atomic.h> 59 57 #include "echoaudio.h" 60 58

+1 -1

sound/pci/echoaudio/indigodj.c

reviewed

+1 -1

sound/pci/echoaudio/indigoio.c

reviewed

··· 46 46 #include <linux/module.h> 47 47 #include <linux/firmware.h> 48 48 #include <linux/slab.h> 49 49 + #include <linux/io.h> 49 50 #include <sound/core.h> 50 51 #include <sound/info.h> 51 52 #include <sound/control.h> ··· 55 54 #include <sound/pcm_params.h> 56 55 #include <sound/asoundef.h> 57 56 #include <sound/initval.h> 58 58 - #include <asm/io.h> 59 57 #include <linux/atomic.h> 60 58 #include "echoaudio.h" 61 59

+1 -1

sound/pci/echoaudio/layla20.c

reviewed

··· 52 52 #include <linux/module.h> 53 53 #include <linux/firmware.h> 54 54 #include <linux/slab.h> 55 55 + #include <linux/io.h> 55 56 #include <sound/core.h> 56 57 #include <sound/info.h> 57 58 #include <sound/control.h> ··· 62 61 #include <sound/asoundef.h> 63 62 #include <sound/initval.h> 64 63 #include <sound/rawmidi.h> 65 65 - #include <asm/io.h> 66 64 #include <linux/atomic.h> 67 65 #include "echoaudio.h" 68 66

+1 -1

sound/pci/echoaudio/layla24.c

reviewed

+1 -1

sound/pci/echoaudio/mia.c

reviewed

··· 53 53 #include <linux/module.h> 54 54 #include <linux/firmware.h> 55 55 #include <linux/slab.h> 56 56 + #include <linux/io.h> 56 57 #include <sound/core.h> 57 58 #include <sound/info.h> 58 59 #include <sound/control.h> ··· 63 62 #include <sound/asoundef.h> 64 63 #include <sound/initval.h> 65 64 #include <sound/rawmidi.h> 66 66 - #include <asm/io.h> 67 65 #include <linux/atomic.h> 68 66 #include "echoaudio.h" 69 67

+1 -1

sound/pci/echoaudio/mona.c

reviewed

··· 51 51 #include <linux/module.h> 52 52 #include <linux/firmware.h> 53 53 #include <linux/slab.h> 54 54 + #include <linux/io.h> 54 55 #include <sound/core.h> 55 56 #include <sound/info.h> 56 57 #include <sound/control.h> ··· 60 59 #include <sound/pcm_params.h> 61 60 #include <sound/asoundef.h> 62 61 #include <sound/initval.h> 63 63 - #include <asm/io.h> 64 62 #include <linux/atomic.h> 65 63 #include "echoaudio.h" 66 64

+1 -1

sound/pci/ens1370.c

reviewed

··· 26 26 * by Kurt J. Bosch 27 27 */ 28 28 29 29 - #include <asm/io.h> 29 29 + #include <linux/io.h> 30 30 #include <linux/delay.h> 31 31 #include <linux/interrupt.h> 32 32 #include <linux/init.h>

+1 -2

sound/pci/es1938.c

reviewed

··· 55 55 #include <linux/module.h> 56 56 #include <linux/delay.h> 57 57 #include <linux/dma-mapping.h> 58 58 + #include <linux/io.h> 58 59 #include <sound/core.h> 59 60 #include <sound/control.h> 60 61 #include <sound/pcm.h> ··· 63 62 #include <sound/mpu401.h> 64 63 #include <sound/initval.h> 65 64 #include <sound/tlv.h> 66 66 - 67 67 - #include <asm/io.h> 68 65 69 66 MODULE_AUTHOR("Jaromir Koutek <miri@punknet.cz>"); 70 67 MODULE_DESCRIPTION("ESS Solo-1");

+1 -1

sound/pci/es1968.c

reviewed

··· 94 94 * places. 95 95 */ 96 96 97 97 - #include <asm/io.h> 97 97 + #include <linux/io.h> 98 98 #include <linux/delay.h> 99 99 #include <linux/interrupt.h> 100 100 #include <linux/init.h>

+1 -1

sound/pci/ice1712/ak4xxx.c

reviewed

··· 21 21 * 22 22 */ 23 23 24 24 - #include <asm/io.h> 24 24 + #include <linux/io.h> 25 25 #include <linux/delay.h> 26 26 #include <linux/interrupt.h> 27 27 #include <linux/slab.h>

+1 -1

sound/pci/intel8x0.c

reviewed

··· 26 26 * 27 27 */ 28 28 29 29 - #include <asm/io.h> 29 29 + #include <linux/io.h> 30 30 #include <linux/delay.h> 31 31 #include <linux/interrupt.h> 32 32 #include <linux/init.h>

+1 -1

sound/pci/intel8x0m.c

reviewed

··· 23 23 * 24 24 */ 25 25 26 26 - #include <asm/io.h> 26 26 + #include <linux/io.h> 27 27 #include <linux/delay.h> 28 28 #include <linux/interrupt.h> 29 29 #include <linux/init.h>

+1 -2

sound/pci/korg1212/korg1212.c

reviewed

··· 28 28 #include <linux/module.h> 29 29 #include <linux/mutex.h> 30 30 #include <linux/firmware.h> 31 31 + #include <linux/io.h> 31 32 32 33 #include <sound/core.h> 33 34 #include <sound/info.h> ··· 36 35 #include <sound/pcm.h> 37 36 #include <sound/pcm_params.h> 38 37 #include <sound/initval.h> 39 39 - 40 40 - #include <asm/io.h> 41 38 42 39 // ---------------------------------------------------------------------------- 43 40 // Debug Stuff

+1 -1

sound/pci/maestro3.c

reviewed

··· 31 31 #define CARD_NAME "ESS Maestro3/Allegro/Canyon3D-2" 32 32 #define DRIVER_NAME "Maestro3" 33 33 34 34 - #include <asm/io.h> 34 34 + #include <linux/io.h> 35 35 #include <linux/delay.h> 36 36 #include <linux/interrupt.h> 37 37 #include <linux/init.h>

+1 -1

sound/pci/mixart/mixart_core.c

reviewed

··· 23 23 #include <linux/interrupt.h> 24 24 #include <linux/mutex.h> 25 25 #include <linux/pci.h> 26 26 + #include <linux/io.h> 26 27 27 27 - #include <asm/io.h> 28 28 #include <sound/core.h> 29 29 #include "mixart.h" 30 30 #include "mixart_hwdep.h"

+1 -1

sound/pci/mixart/mixart_hwdep.c

reviewed

··· 26 26 #include <linux/vmalloc.h> 27 27 #include <linux/slab.h> 28 28 #include <linux/module.h> 29 29 - #include <asm/io.h> 29 29 + #include <linux/io.h> 30 30 #include <sound/core.h> 31 31 #include "mixart.h" 32 32 #include "mixart_mixer.h"

+1 -1

sound/pci/nm256/nm256.c

reviewed

··· 24 24 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 25 25 */ 26 26 27 27 - #include <asm/io.h> 27 27 + #include <linux/io.h> 28 28 #include <linux/delay.h> 29 29 #include <linux/interrupt.h> 30 30 #include <linux/init.h>

+1 -1

sound/pci/oxygen/oxygen_io.c

reviewed

··· 20 20 #include <linux/delay.h> 21 21 #include <linux/sched.h> 22 22 #include <linux/export.h> 23 23 + #include <linux/io.h> 23 24 #include <sound/core.h> 24 25 #include <sound/mpu401.h> 25 25 - #include <asm/io.h> 26 26 #include "oxygen.h" 27 27 28 28 u8 oxygen_read8(struct oxygen *chip, unsigned int reg)

+1 -1

sound/pci/pcxhr/pcxhr_core.c

reviewed

··· 24 24 #include <linux/firmware.h> 25 25 #include <linux/interrupt.h> 26 26 #include <linux/pci.h> 27 27 - #include <asm/io.h> 27 27 + #include <linux/io.h> 28 28 #include <sound/core.h> 29 29 #include "pcxhr.h" 30 30 #include "pcxhr_mixer.h"

+1 -1

sound/pci/pcxhr/pcxhr_hwdep.c

reviewed

··· 25 25 #include <linux/firmware.h> 26 26 #include <linux/pci.h> 27 27 #include <linux/module.h> 28 28 - #include <asm/io.h> 28 28 + #include <linux/io.h> 29 29 #include <sound/core.h> 30 30 #include <sound/hwdep.h> 31 31 #include "pcxhr.h"

+1 -1

sound/pci/riptide/riptide.c

reviewed

··· 99 99 #include <linux/firmware.h> 100 100 #include <linux/kernel.h> 101 101 #include <linux/module.h> 102 102 - #include <asm/io.h> 102 102 + #include <linux/io.h> 103 103 #include <sound/core.h> 104 104 #include <sound/info.h> 105 105 #include <sound/control.h>

+1 -2

sound/pci/rme32.c

reviewed

··· 75 75 #include <linux/interrupt.h> 76 76 #include <linux/pci.h> 77 77 #include <linux/module.h> 78 78 + #include <linux/io.h> 78 79 79 80 #include <sound/core.h> 80 81 #include <sound/info.h> ··· 85 84 #include <sound/pcm-indirect.h> 86 85 #include <sound/asoundef.h> 87 86 #include <sound/initval.h> 88 88 - 89 89 - #include <asm/io.h> 90 87 91 88 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ 92 89 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */

+1 -2

sound/pci/rme96.c

reviewed

··· 29 29 #include <linux/pci.h> 30 30 #include <linux/module.h> 31 31 #include <linux/vmalloc.h> 32 32 + #include <linux/io.h> 32 33 33 34 #include <sound/core.h> 34 35 #include <sound/info.h> ··· 38 37 #include <sound/pcm_params.h> 39 38 #include <sound/asoundef.h> 40 39 #include <sound/initval.h> 41 41 - 42 42 - #include <asm/io.h> 43 40 44 41 /* note, two last pcis should be equal, it is not a bug */ 45 42

+1 -1

sound/pci/rme9652/hdsp.c

reviewed

··· 29 29 #include <linux/module.h> 30 30 #include <linux/math64.h> 31 31 #include <linux/vmalloc.h> 32 32 + #include <linux/io.h> 32 33 33 34 #include <sound/core.h> 34 35 #include <sound/control.h> ··· 43 42 44 43 #include <asm/byteorder.h> 45 44 #include <asm/current.h> 46 46 - #include <asm/io.h> 47 45 48 46 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ 49 47 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */

+1 -1

sound/pci/rme9652/hdspm.c

reviewed

··· 136 136 #include <linux/slab.h> 137 137 #include <linux/pci.h> 138 138 #include <linux/math64.h> 139 139 - #include <asm/io.h> 139 139 + #include <linux/io.h> 140 140 141 141 #include <sound/core.h> 142 142 #include <sound/control.h>

+1 -1

sound/pci/rme9652/rme9652.c

reviewed

··· 25 25 #include <linux/interrupt.h> 26 26 #include <linux/pci.h> 27 27 #include <linux/module.h> 28 28 + #include <linux/io.h> 28 29 29 30 #include <sound/core.h> 30 31 #include <sound/control.h> ··· 35 34 #include <sound/initval.h> 36 35 37 36 #include <asm/current.h> 38 38 - #include <asm/io.h> 39 37 40 38 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ 41 39 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */

+1 -2

sound/pci/sonicvibes.c

reviewed

··· 30 30 #include <linux/gameport.h> 31 31 #include <linux/module.h> 32 32 #include <linux/dma-mapping.h> 33 33 + #include <linux/io.h> 33 34 34 35 #include <sound/core.h> 35 36 #include <sound/pcm.h> ··· 39 38 #include <sound/mpu401.h> 40 39 #include <sound/opl3.h> 41 40 #include <sound/initval.h> 42 42 - 43 43 - #include <asm/io.h> 44 41 45 42 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); 46 43 MODULE_DESCRIPTION("S3 SonicVibes PCI");

+1 -2

sound/pci/trident/trident_main.c

reviewed

··· 36 36 #include <linux/gameport.h> 37 37 #include <linux/dma-mapping.h> 38 38 #include <linux/export.h> 39 39 + #include <linux/io.h> 39 40 40 41 #include <sound/core.h> 41 42 #include <sound/info.h> ··· 44 43 #include <sound/tlv.h> 45 44 #include "trident.h" 46 45 #include <sound/asoundef.h> 47 47 - 48 48 - #include <asm/io.h> 49 46 50 47 static int snd_trident_pcm_mixer_build(struct snd_trident *trident, 51 48 struct snd_trident_voice * voice,

+1 -1

sound/pci/trident/trident_memory.c

reviewed

··· 23 23 * 24 24 */ 25 25 26 26 - #include <asm/io.h> 26 26 + #include <linux/io.h> 27 27 #include <linux/pci.h> 28 28 #include <linux/time.h> 29 29 #include <linux/mutex.h>

+1 -1

sound/pci/via82xx.c

reviewed

··· 46 46 * - Optimize position calculation for the 823x chips. 47 47 */ 48 48 49 49 - #include <asm/io.h> 49 49 + #include <linux/io.h> 50 50 #include <linux/delay.h> 51 51 #include <linux/interrupt.h> 52 52 #include <linux/init.h>

+1 -1

sound/pci/via82xx_modem.c

reviewed

··· 31 31 * modems. 32 32 */ 33 33 34 34 - #include <asm/io.h> 34 34 + #include <linux/io.h> 35 35 #include <linux/delay.h> 36 36 #include <linux/interrupt.h> 37 37 #include <linux/init.h>

+1 -1

sound/pci/vx222/vx222_ops.c

reviewed

··· 24 24 #include <linux/device.h> 25 25 #include <linux/firmware.h> 26 26 #include <linux/mutex.h> 27 27 + #include <linux/io.h> 27 28 28 29 #include <sound/core.h> 29 30 #include <sound/control.h> 30 31 #include <sound/tlv.h> 31 31 - #include <asm/io.h> 32 32 #include "vx222.h" 33 33 34 34

+1 -1

sound/pci/ymfpci/ymfpci_main.c

reviewed

··· 27 27 #include <linux/slab.h> 28 28 #include <linux/mutex.h> 29 29 #include <linux/module.h> 30 30 + #include <linux/io.h> 30 31 31 32 #include <sound/core.h> 32 33 #include <sound/control.h> ··· 37 36 #include <sound/asoundef.h> 38 37 #include <sound/mpu401.h> 39 38 40 40 - #include <asm/io.h> 41 39 #include <asm/byteorder.h> 42 40 43 41 /*

+1 -1

sound/ppc/awacs.c

reviewed

··· 20 20 */ 21 21 22 22 23 23 - #include <asm/io.h> 23 23 + #include <linux/io.h> 24 24 #include <asm/nvram.h> 25 25 #include <linux/init.h> 26 26 #include <linux/delay.h>

+1 -1

sound/ppc/beep.c

reviewed

··· 18 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 */ 20 20 21 21 - #include <asm/io.h> 21 21 + #include <linux/io.h> 22 22 #include <asm/irq.h> 23 23 #include <linux/init.h> 24 24 #include <linux/slab.h>

+1 -1

sound/ppc/burgundy.c

reviewed

··· 19 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 20 */ 21 21 22 22 - #include <asm/io.h> 22 22 + #include <linux/io.h> 23 23 #include <linux/init.h> 24 24 #include <linux/delay.h> 25 25 #include <sound/core.h>

+1 -1

sound/ppc/pmac.c

reviewed

··· 20 20 */ 21 21 22 22 23 23 - #include <asm/io.h> 23 23 + #include <linux/io.h> 24 24 #include <asm/irq.h> 25 25 #include <linux/init.h> 26 26 #include <linux/delay.h>

+1 -1

sound/ppc/tumbler.c

reviewed

··· 32 32 #include <linux/interrupt.h> 33 33 #include <linux/string.h> 34 34 #include <linux/of_irq.h> 35 35 + #include <linux/io.h> 35 36 #include <sound/core.h> 36 36 - #include <asm/io.h> 37 37 #include <asm/irq.h> 38 38 #include <asm/machdep.h> 39 39 #include <asm/pmac_feature.h>

+1 -1

sound/sh/aica.c

reviewed

··· 35 35 #include <linux/timer.h> 36 36 #include <linux/delay.h> 37 37 #include <linux/workqueue.h> 38 38 + #include <linux/io.h> 38 39 #include <sound/core.h> 39 40 #include <sound/control.h> 40 41 #include <sound/pcm.h> 41 42 #include <sound/initval.h> 42 43 #include <sound/info.h> 43 43 - #include <asm/io.h> 44 44 #include <asm/dma.h> 45 45 #include <mach/sysasic.h> 46 46 #include "aica.h"

+1 -1

sound/sparc/amd7930.c

reviewed

··· 37 37 #include <linux/moduleparam.h> 38 38 #include <linux/of.h> 39 39 #include <linux/of_device.h> 40 40 + #include <linux/io.h> 40 41 41 42 #include <sound/core.h> 42 43 #include <sound/pcm.h> ··· 45 44 #include <sound/control.h> 46 45 #include <sound/initval.h> 47 46 48 48 - #include <asm/io.h> 49 47 #include <asm/irq.h> 50 48 #include <asm/prom.h> 51 49