Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 6cbbfe1

Browse files
committed
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>
1 parent 3741958 commit 6cbbfe1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+100
-111
lines changed

include/sound/emu10k1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
#include <linux/interrupt.h>
3434
#include <linux/mutex.h>
3535
#include <linux/firmware.h>
36+
#include <linux/io.h>
3637

37-
#include <asm/io.h>
3838
#include <uapi/sound/emu10k1.h>
3939

4040
/* ------------------- DEFINES -------------------- */

include/sound/gus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <sound/timer.h>
2828
#include <sound/seq_midi_emul.h>
2929
#include <sound/seq_device.h>
30-
#include <asm/io.h>
30+
#include <linux/io.h>
3131

3232
/* IO ports */
3333

include/sound/sb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <sound/pcm.h>
2626
#include <sound/rawmidi.h>
2727
#include <linux/interrupt.h>
28-
#include <asm/io.h>
28+
#include <linux/io.h>
2929

3030
enum sb_hw_type {
3131
SB_HW_AUTO,

sound/aoa/soundbus/i2sbus/control.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <linux/kernel.h>
1010
#include <linux/delay.h>
1111
#include <linux/slab.h>
12+
#include <linux/io.h>
1213

13-
#include <asm/io.h>
1414
#include <asm/prom.h>
1515
#include <asm/macio.h>
1616
#include <asm/pmac_feature.h>

sound/aoa/soundbus/i2sbus/pcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* GPL v2, can be found in COPYING.
77
*/
88

9-
#include <asm/io.h>
9+
#include <linux/io.h>
1010
#include <linux/delay.h>
1111
#include <linux/slab.h>
1212
#include <sound/core.h>

sound/core/memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222

2323
#include <linux/export.h>
24-
#include <asm/io.h>
24+
#include <linux/io.h>
2525
#include <asm/uaccess.h>
2626
#include <sound/core.h>
2727

sound/core/pcm_memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
#include <asm/io.h>
22+
#include <linux/io.h>
2323
#include <linux/time.h>
2424
#include <linux/init.h>
2525
#include <linux/slab.h>

sound/core/pcm_native.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <linux/time.h>
2727
#include <linux/pm_qos.h>
2828
#include <linux/aio.h>
29+
#include <linux/io.h>
2930
#include <linux/dma-mapping.h>
3031
#include <sound/core.h>
3132
#include <sound/control.h>
@@ -34,7 +35,6 @@
3435
#include <sound/pcm_params.h>
3536
#include <sound/timer.h>
3637
#include <sound/minors.h>
37-
#include <asm/io.h>
3838

3939
/*
4040
* Compatibility

sound/drivers/mpu401/mpu401_uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*
2929
*/
3030

31-
#include <asm/io.h>
31+
#include <linux/io.h>
3232
#include <linux/delay.h>
3333
#include <linux/init.h>
3434
#include <linux/slab.h>

sound/drivers/opl3/opl3_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
#include <sound/opl3.h>
27-
#include <asm/io.h>
27+
#include <linux/io.h>
2828
#include <linux/delay.h>
2929
#include <linux/module.h>
3030
#include <linux/init.h>

0 commit comments

Comments
 (0)