Commit 7034b0e6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 416112f8

arch/arm/kernel/isa.c

+42 −21
Original line number Diff line number Diff line
@@ -3,21 +3,14 @@ 
 *

 *  Copyright (C) 1999 Phil Blundell

 *

 *  ISA shared memory and I/O port support

 */



/*

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either 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/types.h>

#include <linux/fs.h>
@@ -27,21 +20,49 @@ 
static unsigned int isa_membase, isa_portbase, isa_portshift;



static ctl_table ctl_isa_vars[4] = {

	{BUS_ISA_MEM_BASE, "membase", &isa_membase, 

	 sizeof(isa_membase), 0444, NULL, &proc_dointvec},

	{BUS_ISA_PORT_BASE, "portbase", &isa_portbase, 

	 sizeof(isa_portbase), 0444, NULL, &proc_dointvec},

	{BUS_ISA_PORT_SHIFT, "portshift", &isa_portshift, 

	 sizeof(isa_portshift), 0444, NULL, &proc_dointvec},

	{0}

	{

		.ctl_name	= BUS_ISA_MEM_BASE,

		.procname	= "membase",

		.data		= &isa_membase, 

		.maxlen		= sizeof(isa_membase),

		.mode		= 0444,

		.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 ctl_table ctl_isa[2] = {{CTL_BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars},

			       {0}};

static ctl_table ctl_bus[2] = {{CTL_BUS, "bus", NULL, 0, 0555, ctl_isa},

			       {0}};

static ctl_table ctl_isa[2] = {

	{

		.ctl_name	= CTL_BUS_ISA,

		.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

register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int portshift)