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

Commit 65a129d7 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Fix kernel-doc build warning
  PCI: Move PCI_QUIRKS to the PCI bus menu
  alpha/PCI: Make pdev_save_srm_config() static
  PCI: Remove unused declarations
  PCI: Remove redundant pci_dev, pci_bus, resource declarations
  PCI: Remove redundant pcibios_set_master() declarations
  PCI/PME: Handle invalid data when reading Root Status
  x86/pci/intel_mid_pci: Constify intel_mid_pci_ops and make it __initconst
  PCI: Constify pci_dev_type structure
parents 8d666e53 505fb746

arch/alpha/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ 
 * The following structure is used to manage multiple PCI busses.

 */



struct pci_dev;

struct pci_bus;

struct resource;

struct pci_iommu_arena;

struct page;
@@ -56,8 +53,6 @@ struct pci_controller { 
#define PCIBIOS_MIN_IO		alpha_mv.min_io_address

#define PCIBIOS_MIN_MEM		alpha_mv.min_mem_address



extern void pcibios_set_master(struct pci_dev *dev);



/* IOMMU controls.  */



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

arch/alpha/kernel/pci.c

+10 −1
Original line number Diff line number Diff line
@@ -196,9 +196,16 @@ pcibios_init(void) 
subsys_initcall(pcibios_init);



#ifdef ALPHA_RESTORE_SRM_SETUP

/* Store PCI device configuration left by SRM here. */

struct pdev_srm_saved_conf

{

	struct pdev_srm_saved_conf *next;

	struct pci_dev *dev;

};



static struct pdev_srm_saved_conf *srm_saved_configs;



void pdev_save_srm_config(struct pci_dev *dev)

static void pdev_save_srm_config(struct pci_dev *dev)

{

	struct pdev_srm_saved_conf *tmp;

	static int printed = 0;
@@ -238,6 +245,8 @@ pci_restore_srm_config(void) 
		pci_restore_state(tmp->dev);

	}

}

#else

#define pdev_save_srm_config(dev)	do {} while (0)

#endif



void pcibios_fixup_bus(struct pci_bus *bus)

arch/alpha/kernel/pci_impl.h

+0 −8
Original line number Diff line number Diff line
@@ -156,16 +156,8 @@ struct pci_iommu_arena 
#endif



#ifdef ALPHA_RESTORE_SRM_SETUP

/* Store PCI device configuration left by SRM here. */

struct pdev_srm_saved_conf

{

	struct pdev_srm_saved_conf *next;

	struct pci_dev *dev;

};



extern void pci_restore_srm_config(void);

#else

#define pdev_save_srm_config(dev)	do {} while (0)

#define pci_restore_srm_config()	do {} while (0)

#endif

arch/cris/include/asm/pci.h

+0 −9
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ 


#define PCIBIOS_MIN_CARDBUS_IO	0x4000



void pcibios_config_init(void);

struct pci_bus * pcibios_scan_root(int bus);



void pcibios_set_master(struct pci_dev *dev);

struct irq_routing_table *pcibios_get_irq_routing_table(void);

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



/* Dynamic DMA mapping stuff.

 * i386 has everything mapped statically.

 */
@@ -33,8 +26,6 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); 
#include <linux/string.h>

#include <asm/io.h>



struct pci_dev;



/* The PCI address space does equal the physical memory

 * address space.  The networking and block device layers use

 * this boolean for bounce buffer decisions.

arch/frv/include/asm/pci.h

+0 −4
Original line number Diff line number Diff line
@@ -17,12 +17,8 @@ 
#include <linux/scatterlist.h>

#include <asm-generic/pci.h>



struct pci_dev;



#define pcibios_assign_all_busses()	0



extern void pcibios_set_master(struct pci_dev *dev);



#ifdef CONFIG_MMU

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

extern void consistent_free(void *vaddr);