Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] Arrange for isa.c to use named initialisers
Convert isa.c (the glibc interface for emulating ISA IO) to use
named initialisers.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Russell King and committed by Russell King 7034b0e6 416112f8
+42
-21
arch/arm/kernel/isa.c
+42
-21
arch/arm/kernel/isa.c
···
3
3
*
4
4
* Copyright (C) 1999 Phil Blundell
5
5
*
6
-
* ISA shared memory and I/O port support
7
-
*/
8
-
9
-
/*
10
6
* This program is free software; you can redistribute it and/or
11
7
* modify it under the terms of the GNU General Public License
12
8
* as published by the Free Software Foundation; either version
13
9
* 2 of the License, or (at your option) any later version.
10
+
*
11
+
* ISA shared memory and I/O port support, and is required to support
12
+
* iopl, inb, outb and friends in userspace via glibc emulation.
14
13
*/
15
-
16
-
/*
17
-
* Nothing about this is actually ARM specific. One day we could move
18
-
* it into kernel/resource.c or some place like that.
19
-
*/
20
-
21
14
#include <linux/stddef.h>
22
15
#include <linux/types.h>
23
16
#include <linux/fs.h>
···
20
27
static unsigned int isa_membase, isa_portbase, isa_portshift;
21
28
22
29
static ctl_table ctl_isa_vars[4] = {
23
-
{BUS_ISA_MEM_BASE, "membase", &isa_membase,
24
-
sizeof(isa_membase), 0444, NULL, &proc_dointvec},
25
-
{BUS_ISA_PORT_BASE, "portbase", &isa_portbase,
26
-
sizeof(isa_portbase), 0444, NULL, &proc_dointvec},
27
-
{BUS_ISA_PORT_SHIFT, "portshift", &isa_portshift,
28
-
sizeof(isa_portshift), 0444, NULL, &proc_dointvec},
29
-
{0}
30
+
{
31
+
.ctl_name = BUS_ISA_MEM_BASE,
32
+
.procname = "membase",
33
+
.data = &isa_membase,
34
+
.maxlen = sizeof(isa_membase),
35
+
.mode = 0444,
36
+
.proc_handler = &proc_dointvec,
37
+
}, {
38
+
.ctl_name = BUS_ISA_PORT_BASE,
39
+
.procname = "portbase",
40
+
.data = &isa_portbase,
41
+
.maxlen = sizeof(isa_portbase),
42
+
.mode = 0444,
43
+
.proc_handler = &proc_dointvec,
44
+
}, {
45
+
.ctl_name = BUS_ISA_PORT_SHIFT,
46
+
.procname = "portshift",
47
+
.data = &isa_portshift,
48
+
.maxlen = sizeof(isa_portshift),
49
+
.mode = 0444,
50
+
.proc_handler = &proc_dointvec,
51
+
}, {0}
30
52
};
31
53
32
54
static struct ctl_table_header *isa_sysctl_header;
33
55
34
-
static ctl_table ctl_isa[2] = {{CTL_BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars},
35
-
{0}};
36
-
static ctl_table ctl_bus[2] = {{CTL_BUS, "bus", NULL, 0, 0555, ctl_isa},
37
-
{0}};
56
+
static ctl_table ctl_isa[2] = {
57
+
{
58
+
.ctl_name = CTL_BUS_ISA,
59
+
.procname = "isa",
60
+
.mode = 0555,
61
+
.child = ctl_isa_vars,
62
+
}, {0}
63
+
};
64
+
65
+
static ctl_table ctl_bus[2] = {
66
+
{
67
+
.ctl_name = CTL_BUS,
68
+
.procname = "bus",
69
+
.mode = 0555,
70
+
.child = ctl_isa,
71
+
}, {0}
72
+
};
38
73
39
74
void __init
40
75
register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int portshift)