tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
x86: io_delay.c cleanup
Impact: cleanup
- fix header file issues
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
+13
-14
+13
-14
arch/x86/kernel/io_delay.c
+13
-14
arch/x86/kernel/io_delay.c
···
7
7
*/
8
8
#include <linux/kernel.h>
9
9
#include <linux/module.h>
10
-
#include <linux/init.h>
11
10
#include <linux/delay.h>
11
+
#include <linux/init.h>
12
12
#include <linux/dmi.h>
13
-
#include <asm/io.h>
13
+
#include <linux/io.h>
14
14
15
15
int io_delay_type __read_mostly = CONFIG_DEFAULT_IO_DELAY_TYPE;
16
16
···
47
47
static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
48
48
{
49
49
if (io_delay_type == CONFIG_IO_DELAY_TYPE_0X80) {
50
-
printk(KERN_NOTICE "%s: using 0xed I/O delay port\n",
51
-
id->ident);
50
+
pr_notice("%s: using 0xed I/O delay port\n", id->ident);
52
51
io_delay_type = CONFIG_IO_DELAY_TYPE_0XED;
53
52
}
54
53
···
63
64
.callback = dmi_io_delay_0xed_port,
64
65
.ident = "Compaq Presario V6000",
65
66
.matches = {
66
-
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
67
-
DMI_MATCH(DMI_BOARD_NAME, "30B7")
67
+
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
68
+
DMI_MATCH(DMI_BOARD_NAME, "30B7")
68
69
}
69
70
},
70
71
{
71
72
.callback = dmi_io_delay_0xed_port,
72
73
.ident = "HP Pavilion dv9000z",
73
74
.matches = {
74
-
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
75
-
DMI_MATCH(DMI_BOARD_NAME, "30B9")
75
+
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
76
+
DMI_MATCH(DMI_BOARD_NAME, "30B9")
76
77
}
77
78
},
78
79
{
79
80
.callback = dmi_io_delay_0xed_port,
80
81
.ident = "HP Pavilion dv6000",
81
82
.matches = {
82
-
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
83
-
DMI_MATCH(DMI_BOARD_NAME, "30B8")
83
+
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
84
+
DMI_MATCH(DMI_BOARD_NAME, "30B8")
84
85
}
85
86
},
86
87
{
87
88
.callback = dmi_io_delay_0xed_port,
88
89
.ident = "HP Pavilion tx1000",
89
90
.matches = {
90
-
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
91
-
DMI_MATCH(DMI_BOARD_NAME, "30BF")
91
+
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
92
+
DMI_MATCH(DMI_BOARD_NAME, "30BF")
92
93
}
93
94
},
94
95
{
95
96
.callback = dmi_io_delay_0xed_port,
96
97
.ident = "Presario F700",
97
98
.matches = {
98
-
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
99
-
DMI_MATCH(DMI_BOARD_NAME, "30D3")
99
+
DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
100
+
DMI_MATCH(DMI_BOARD_NAME, "30D3")
100
101
}
101
102
},
102
103
{ }