Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Fix return value from pci_user_{read,write}_config_*()
  PCI: Turn pcibios_penalize_isa_irq() into a weak function
  PCI: Test for std config alias when testing extended config space
parents d1a2523d d97ffe23

arch/alpha/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -59,11 +59,6 @@ struct pci_controller { 


extern void pcibios_set_master(struct pci_dev *dev);



extern inline void pcibios_penalize_isa_irq(int irq, int active)

{

	/* We don't do dynamic PCI IRQ allocation */

}



/* IOMMU controls.  */



/* The PCI address space does not equal the physical memory address space.

arch/arm/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
}

#endif /* CONFIG_PCI_DOMAINS */



static inline void pcibios_penalize_isa_irq(int irq, int active)

{

	/* We don't do dynamic PCI IRQ allocation */

}



/*

 * The PCI address space does equal the physical memory address space.

 * The networking and block device layers use this boolean for bounce

arch/blackfin/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -10,9 +10,4 @@ 
#define PCIBIOS_MIN_IO 0x00001000

#define PCIBIOS_MIN_MEM 0x10000000



static inline void pcibios_penalize_isa_irq(int irq)

{

	/* We don't do dynamic PCI IRQ allocation */

}



#endif				/* _ASM_BFIN_PCI_H */

arch/cris/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ void pcibios_config_init(void); 
struct pci_bus * pcibios_scan_root(int bus);



void pcibios_set_master(struct pci_dev *dev);

void pcibios_penalize_isa_irq(int irq);

struct irq_routing_table *pcibios_get_irq_routing_table(void);

int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);

arch/frv/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ struct pci_dev; 


extern void pcibios_set_master(struct pci_dev *dev);



extern void pcibios_penalize_isa_irq(int irq);



#ifdef CONFIG_MMU

extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle);

extern void consistent_free(void *vaddr);