x86/pci: Changing subsystem init for visws
PATCH 1/1 x86/pci: Changing subsystem init for visws
I don't know, if this new code boots, but at least it compiles. Someone should really test it.
Signed-off-by Robert Richter <[email protected]>
--- arch/x86/pci/legacy.c | 3 +++ arch/x86/pci/pci.h | 1 + arch/x86/pci/visws.c | 23 +++++++---------------- 3 files changed, 11 insertions(+), 16 deletions(-)
arch/x86/pci/legacy.c +3 -0
@@ -63,6 +63,9 @@ int __init pci_subsys_init(void)#ifdef CONFIG_ACPI pci_acpi_init ();#endif +#ifdef CONFIG_X86_VISWS +pci_visws_init (); +#endif pci_legacy_init ();pcibios_irq_init ();pcibios_init ();
arch/x86/pci/pci.h +1 -0
@@ -107,6 +107,7 @@ extern void __init dmi_check_skip_isa_align(void);/* some common used subsys_initcalls */ extern int __init pci_acpi_init (void );extern int __init pcibios_irq_init (void ); +extern int __init pci_visws_init (void );extern int __init pci_numaq_init (void );extern int __init pcibios_init (void );
arch/x86/pci/visws.c +7 -16
@@ -86,8 +86,14 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)pci_write_config_byte (dev,PCI_INTERRUPT_LINE , irq); } -static int __init pci_visws_init (void ) +int __init pci_visws_init (void ) { +if (!is_visws_box ()) +return -1 ; + + pcibios_enable_irq = &pci_visws_enable_irq; + pcibios_disable_irq = &pci_visws_disable_irq; +/* The VISWS supports configuration access type 1 only */ pci_probe = (pci_probe |PCI_PROBE_CONF1 ) & ~(PCI_PROBE_BIOS |PCI_PROBE_CONF2 );
@@ -105,18 +111,3 @@ static int __init pci_visws_init(void)pcibios_resource_survey ();return 0 ; } - -static __init int pci_subsys_init (void ) -{ -if (!is_visws_box ()) -return -1 ; - - pcibios_enable_irq = &pci_visws_enable_irq; - pcibios_disable_irq = &pci_visws_disable_irq; - -pci_visws_init (); -pcibios_init (); - -return 0 ; -} -subsys_initcall (pci_subsys_init);
Signature · 1 line
1.5.5.4