lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: ce4100: Set pci ops via callback instead of module init

Browse Source 
Setting the pci ops on subsys initcall unconditionally will break
multi platform kernels on anything except ce4100.

Use x86_init.pci.init ops to call this only on real ce4100 platforms.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: sodaville@linutronix.de
LKML-Reference: <20110314093340.GA21026@www.tglx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Sebastian Andrzej Siewior
2011-03-14 10:33:40 +01:00
committed by Thomas Gleixner
parent a79e53d856
commit 03150171dc
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/pci/ce4100.c
View File

@@ -34,6 +34,7 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <asm/ce4100.h>
#include <asm/pci_x86.h>
struct sim_reg {
@@ -306,10 +307,10 @@ struct pci_raw_ops ce4100_pci_conf = {
.write = ce4100_conf_write,
};
static int __init ce4100_pci_init(void)
int __init ce4100_pci_init(void)
{
init_sim_regs();
raw_pci_ops = &ce4100_pci_conf;
return 0;
/* Indicate caller that it should invoke pci_legacy_init() */
return 1;
}
subsys_initcall(ce4100_pci_init);