Commit e84d0ded authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: cpqphp: Cleanup and remove unreachable paths
  PCI: Drop "__" prefix on __pci_enable_device_flags()
  PCI: Use "unsigned long" for __pci_enable_device_flags to match ioport.h
  mn10300/PCI: Remove unused pci_root_bus
  frv/PCI: Remove unused pci_root_bus
  x86/PCI: Remove unused pci_root_bus
parents d1c3ed66 3ecd9d01

arch/frv/mb93090-mb00/pci-frv.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ void pcibios_resource_survey(void); 
/* pci-vdk.c */



extern int __nongpreldata pcibios_last_bus;

extern struct pci_bus *__nongpreldata pci_root_bus;

extern struct pci_ops *__nongpreldata pci_root_ops;



/* pci-irq.c */

arch/frv/mb93090-mb00/pci-vdk.c

+1 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
unsigned int __nongpreldata pci_probe = 1;



int  __nongpreldata pcibios_last_bus = -1;

struct pci_bus *__nongpreldata pci_root_bus;

struct pci_ops *__nongpreldata pci_root_ops;



/*
@@ -416,8 +415,7 @@ int __init pcibios_init(void) 
	printk("PCI: Probing PCI hardware\n");

	pci_add_resource(&resources, &pci_ioport_resource);

	pci_add_resource(&resources, &pci_iomem_resource);

	pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL,

					 &resources);

	pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, &resources);



	pcibios_irq_init();

	pcibios_fixup_peer_bridges();

arch/mn10300/unit-asb2305/pci-asb2305.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ extern void pcibios_resource_survey(void); 
/* pci.c */



extern int pcibios_last_bus;

extern struct pci_bus *pci_root_bus;

extern struct pci_ops *pci_root_ops;



extern struct irq_routing_table *pcibios_get_irq_routing_table(void);

arch/mn10300/unit-asb2305/pci.c

+1 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
unsigned int pci_probe = 1;



int pcibios_last_bus = -1;

struct pci_bus *pci_root_bus;

struct pci_ops *pci_root_ops;



/*
@@ -377,8 +376,7 @@ static int __init pcibios_init(void) 


	pci_add_resource_offset(&resources, &pci_ioport_resource, io_offset);

	pci_add_resource_offset(&resources, &pci_iomem_resource, mem_offset);

	pci_root_bus = pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL,

					 &resources);

	pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL, &resources);



	pcibios_irq_init();

	pcibios_fixup_irqs();

arch/x86/include/asm/pci_x86.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ void pcibios_set_cache_line_size(void); 
/* pci-pc.c */



extern int pcibios_last_bus;

extern struct pci_bus *pci_root_bus;

extern struct pci_ops pci_root_ops;



void pcibios_scan_specific_bus(int busn);

CRA Git | Maintained and supported by SUSTech CRA and CCSE