lkml.org 
[lkml]   [2011]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] x86/ce4100: set pci ops via callback instead of module init
    On Fri, 11 Mar 2011, Sebastian Andrzej Siewior wrote:
    >
    > struct sim_reg {
    > @@ -306,10 +307,8 @@ struct pci_raw_ops ce4100_pci_conf = {
    > .write = ce4100_conf_write,
    > };
    >
    > -static int __init ce4100_pci_init(void)

    Why don't you keep the function name and make it non static, add the
    call to pci_legacy_init() and just set the init.pci pointer to this?

    So all pci is stuff is where it belongs

    Thanks,

    tglx

    > +void __init ce4100_init_pci_ops(void)
    > {
    > init_sim_regs();
    > raw_pci_ops = &ce4100_pci_conf;
    > - return 0;
    > }
    > -subsys_initcall(ce4100_pci_init);
    > diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
    > index 68c0dbc..93b4e3c 100644
    > --- a/arch/x86/platform/ce4100/ce4100.c
    > +++ b/arch/x86/platform/ce4100/ce4100.c
    > @@ -15,6 +15,7 @@
    > #include <linux/serial_reg.h>
    > #include <linux/serial_8250.h>
    >
    > +#include <asm/ce4100.h>
    > #include <asm/prom.h>
    > #include <asm/setup.h>
    > #include <asm/i8259.h>
    > @@ -125,6 +126,13 @@ static void __cpuinit sdv_pci_init(void)
    > }
    > #endif
    >
    > +static int __cpuinit ce4100_pci_init(void)
    > +{
    > + ce4100_init_pci_ops();
    > + pci_legacy_init();
    > + return 0;
    > +}
    > +
    > /*
    > * CE4100 specific x86_init function overrides and early setup
    > * calls.
    > @@ -136,6 +144,7 @@ void __init x86_ce4100_early_setup(void)
    > x86_init.resources.probe_roms = x86_init_noop;
    > x86_init.mpparse.get_smp_config = x86_init_uint_noop;
    > x86_init.mpparse.find_smp_config = x86_init_noop;
    > + x86_init.pci.init = ce4100_pci_init;
    >
    > #ifdef CONFIG_X86_IO_APIC
    > x86_init.pci.init_irq = sdv_pci_init;
    > --
    > 1.7.4
    >


    \
     
     \ /
      Last update: 2011-03-11 17:51    [W:0.057 / U:60.208 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site