lkml.org 
[lkml]   [2011]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[v2 037/115] sysctl: remove .child from bus/isa/ (arm)
    Date
    Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
    ---
    arch/arm/kernel/isa.c | 31 ++++++++++++-------------------
    1 files changed, 12 insertions(+), 19 deletions(-)

    diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
    index 3464859..0236609 100644
    --- a/arch/arm/kernel/isa.c
    +++ b/arch/arm/kernel/isa.c
    @@ -20,44 +20,37 @@

    static unsigned int isa_membase, isa_portbase, isa_portshift;

    -static ctl_table ctl_isa_vars[4] = {
    +static ctl_table isa_table[] = {
    {
    .procname = "membase",
    .data = &isa_membase,
    .maxlen = sizeof(isa_membase),
    .mode = 0444,
    .proc_handler = proc_dointvec,
    - }, {
    + },
    + {
    .procname = "portbase",
    .data = &isa_portbase,
    .maxlen = sizeof(isa_portbase),
    .mode = 0444,
    .proc_handler = proc_dointvec,
    - }, {
    + },
    + {
    .procname = "portshift",
    .data = &isa_portshift,
    .maxlen = sizeof(isa_portshift),
    .mode = 0444,
    .proc_handler = proc_dointvec,
    - }, {}
    + },
    + { }
    };

    static struct ctl_table_header *isa_sysctl_header;

    -static ctl_table ctl_isa[2] = {
    - {
    - .procname = "isa",
    - .mode = 0555,
    - .child = ctl_isa_vars,
    - }, {}
    -};
    -
    -static ctl_table ctl_bus[2] = {
    - {
    - .procname = "bus",
    - .mode = 0555,
    - .child = ctl_isa,
    - }, {}
    +static const __initdata struct ctl_path isa_path[] = {
    + { .procname = "bus" },
    + { .procname = "isa" },
    + { }
    };

    void __init
    @@ -66,5 +59,5 @@ register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int por
    isa_membase = membase;
    isa_portbase = portbase;
    isa_portshift = portshift;
    - isa_sysctl_header = register_sysctl_table(ctl_bus);
    + isa_sysctl_header = register_sysctl_paths(isa_path, isa_table);
    }
    --
    1.7.5.134.g1c08b


    \
     
     \ /
      Last update: 2011-05-09 01:01    [W:0.028 / U:2.020 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site