Commit be2d877a authored by Bjorn Helgaas's avatar Bjorn Helgaas

PCI: Remove redundant pci_dev, pci_bus, resource declarations

<linux/pci.h> defines struct pci_bus and struct pci_dev and includes the
struct resource definition before including <asm/pci.h>.  Nobody includes
<asm/pci.h> directly, so they don't need their own declarations.

Remove the redundant struct pci_dev, pci_bus, resource declarations.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>	# CRIS
Acked-by: Ralf Baechle <ralf@linux-mips.org>		# MIPS
parent 137ed9f0
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
* The following structure is used to manage multiple PCI busses. * The following structure is used to manage multiple PCI busses.
*/ */
struct pci_dev;
struct pci_bus;
struct resource;
struct pci_iommu_arena; struct pci_iommu_arena;
struct page; struct page;
......
...@@ -32,8 +32,6 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); ...@@ -32,8 +32,6 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
#include <linux/string.h> #include <linux/string.h>
#include <asm/io.h> #include <asm/io.h>
struct pci_dev;
/* The PCI address space does equal the physical memory /* The PCI address space does equal the physical memory
* address space. The networking and block device layers use * address space. The networking and block device layers use
* this boolean for bounce buffer decisions. * this boolean for bounce buffer decisions.
......
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <asm-generic/pci.h> #include <asm-generic/pci.h>
struct pci_dev;
#define pcibios_assign_all_busses() 0 #define pcibios_assign_all_busses() 0
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
......
...@@ -31,8 +31,6 @@ struct pci_vector_struct { ...@@ -31,8 +31,6 @@ struct pci_vector_struct {
void pcibios_config_init(void); void pcibios_config_init(void);
struct pci_dev;
/* /*
* PCI_DMA_BUS_IS_PHYS should be set to 1 if there is _necessarily_ a direct * PCI_DMA_BUS_IS_PHYS should be set to 1 if there is _necessarily_ a direct
* correspondence between device bus addresses and CPU physical addresses. * correspondence between device bus addresses and CPU physical addresses.
......
...@@ -121,8 +121,6 @@ extern unsigned long PCIBIOS_MIN_MEM; ...@@ -121,8 +121,6 @@ extern unsigned long PCIBIOS_MIN_MEM;
#include <linux/string.h> #include <linux/string.h>
#include <asm/io.h> #include <asm/io.h>
struct pci_dev;
/* /*
* The PCI address space does equal the physical memory address space. * The PCI address space does equal the physical memory address space.
* The networking and block device layers use this boolean for bounce * The networking and block device layers use this boolean for bounce
......
...@@ -57,8 +57,6 @@ extern void unit_pci_init(void); ...@@ -57,8 +57,6 @@ extern void unit_pci_init(void);
#include <linux/string.h> #include <linux/string.h>
#include <asm/io.h> #include <asm/io.h>
struct pci_dev;
/* The PCI address space does equal the physical memory /* The PCI address space does equal the physical memory
* address space. The networking and block device layers use * address space. The networking and block device layers use
* this boolean for bounce buffer decisions. * this boolean for bounce buffer decisions.
......
...@@ -86,13 +86,6 @@ struct pci_hba_data { ...@@ -86,13 +86,6 @@ struct pci_hba_data {
#define PCI_F_EXTEND 0UL #define PCI_F_EXTEND 0UL
#endif /* !CONFIG_64BIT */ #endif /* !CONFIG_64BIT */
/*
** KLUGE: linux/pci.h include asm/pci.h BEFORE declaring struct pci_bus
** (This eliminates some of the warnings).
*/
struct pci_bus;
struct pci_dev;
/* /*
* If the PCI device's view of memory is the same as the CPU's view of memory, * If the PCI device's view of memory is the same as the CPU's view of memory,
* PCI_DMA_BUS_IS_PHYS is true. The networking and block device layers use * PCI_DMA_BUS_IS_PHYS is true. The networking and block device layers use
......
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
#define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x10000000 #define PCIBIOS_MIN_MEM 0x10000000
struct pci_dev;
/* Values for the `which' argument to sys_pciconfig_iobase syscall. */ /* Values for the `which' argument to sys_pciconfig_iobase syscall. */
#define IOBASE_BRIDGE_NUMBER 0 #define IOBASE_BRIDGE_NUMBER 0
#define IOBASE_MEMORY 1 #define IOBASE_MEMORY 1
......
...@@ -63,8 +63,6 @@ extern int pci_is_66mhz_capable(struct pci_channel *hose, ...@@ -63,8 +63,6 @@ extern int pci_is_66mhz_capable(struct pci_channel *hose,
extern unsigned long PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM; extern unsigned long PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM;
struct pci_dev;
#define HAVE_PCI_MMAP #define HAVE_PCI_MMAP
#define ARCH_GENERIC_PCI_MMAP_RESOURCE #define ARCH_GENERIC_PCI_MMAP_RESOURCE
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
*/ */
#define PCI_DMA_BUS_IS_PHYS (0) #define PCI_DMA_BUS_IS_PHYS (0)
struct pci_dev;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#ifndef CONFIG_LEON_PCI #ifndef CONFIG_LEON_PCI
......
...@@ -37,8 +37,6 @@ extern struct pci_controller* pcibios_alloc_controller(void); ...@@ -37,8 +37,6 @@ extern struct pci_controller* pcibios_alloc_controller(void);
#include <linux/string.h> #include <linux/string.h>
#include <asm/io.h> #include <asm/io.h>
struct pci_dev;
/* The PCI address space does equal the physical memory address space. /* The PCI address space does equal the physical memory address space.
* The networking and block device layers use this boolean for bounce buffer * The networking and block device layers use this boolean for bounce buffer
* decisions. * decisions.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment