Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ARM] Arrange for isa.c to use named initialisers

Browse source 
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>
This commit is contained in:
Russell King 2006-08-28 12:44:03 +01:00 committed by Russell King
parent 416112f818
commit 7034b0e60a
1 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
arch/arm/kernel/isa.c
View file

@ -3,21 +3,14 @@
* *
* Copyright (C) 1999 Phil Blundell * Copyright (C) 1999 Phil Blundell
* *
* ISA shared memory and I/O port support
*/
/*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*
* ISA shared memory and I/O port support, and is required to support
* iopl, inb, outb and friends in userspace via glibc emulation.
*/ */
/*
* Nothing about this is actually ARM specific. One day we could move
* it into kernel/resource.c or some place like that.
*/
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/fs.h> #include <linux/fs.h>
@ -27,21 +20,49 @@
static unsigned int isa_membase, isa_portbase, isa_portshift; static unsigned int isa_membase, isa_portbase, isa_portshift;
static ctl_table ctl_isa_vars[4] = { static ctl_table ctl_isa_vars[4] = {
{BUS_ISA_MEM_BASE, "membase", &isa_membase, {
sizeof(isa_membase), 0444, NULL, &proc_dointvec}, .ctl_name = BUS_ISA_MEM_BASE,
{BUS_ISA_PORT_BASE, "portbase", &isa_portbase, .procname = "membase",
sizeof(isa_portbase), 0444, NULL, &proc_dointvec}, .data = &isa_membase,
{BUS_ISA_PORT_SHIFT, "portshift", &isa_portshift, .maxlen = sizeof(isa_membase),
sizeof(isa_portshift), 0444, NULL, &proc_dointvec}, .mode = 0444,
{0} .proc_handler = &proc_dointvec,
}, {
.ctl_name = BUS_ISA_PORT_BASE,
.procname = "portbase",
.data = &isa_portbase,
.maxlen = sizeof(isa_portbase),
.mode = 0444,
.proc_handler = &proc_dointvec,
}, {
.ctl_name = BUS_ISA_PORT_SHIFT,
.procname = "portshift",
.data = &isa_portshift,
.maxlen = sizeof(isa_portshift),
.mode = 0444,
.proc_handler = &proc_dointvec,
}, {0}
}; };
static struct ctl_table_header *isa_sysctl_header; static struct ctl_table_header *isa_sysctl_header;
static ctl_table ctl_isa[2] = {{CTL_BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars}, static ctl_table ctl_isa[2] = {
{0}}; {
static ctl_table ctl_bus[2] = {{CTL_BUS, "bus", NULL, 0, 0555, ctl_isa}, .ctl_name = CTL_BUS_ISA,
{0}}; .procname = "isa",
.mode = 0555,
.child = ctl_isa_vars,
}, {0}
};
static ctl_table ctl_bus[2] = {
{
.ctl_name = CTL_BUS,
.procname = "bus",
.mode = 0555,
.child = ctl_isa,
}, {0}
};
void __init void __init
register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int portshift) register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int portshift)