Commit 8221a013 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Unify pci_resource_to_user() declarations 



Replace the pci_resource_to_user() declarations in each arch that defines
HAVE_ARCH_PCI_RESOURCE_TO_USER with a single one in linux/pci.h.

Change the MIPS static inline implementation to a non-inline version so the
static inline doesn't conflict with the new non-static linux/pci.h
declaration.

No functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c444a2be

arch/microblaze/include/asm/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, 
					 pgprot_t prot);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER

extern void pci_resource_to_user(const struct pci_dev *dev, int bar,

				 const struct resource *rsrc,

				 resource_size_t *start, resource_size_t *end);



extern void pcibios_setup_bus_devices(struct pci_bus *bus);

extern void pcibios_setup_bus_self(struct pci_bus *bus);

arch/mips/include/asm/pci.h

+0 −10
Original line number Diff line number Diff line
@@ -80,16 +80,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 


#define HAVE_ARCH_PCI_RESOURCE_TO_USER



static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,

		const struct resource *rsrc, resource_size_t *start,

		resource_size_t *end)

{

	phys_addr_t size = resource_size(rsrc);



	*start = fixup_bigphys_addr(rsrc->start, size);

	*end = rsrc->start + size;

}



/*

 * Dynamic DMA mapping stuff.

 * MIPS has everything mapped statically.

arch/mips/pci/pci.c

+10 −0
Original line number Diff line number Diff line
@@ -319,6 +319,16 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
EXPORT_SYMBOL(PCIBIOS_MIN_IO);

EXPORT_SYMBOL(PCIBIOS_MIN_MEM);



void pci_resource_to_user(const struct pci_dev *dev, int bar,

			  const struct resource *rsrc, resource_size_t *start,

			  resource_size_t *end)

{

	phys_addr_t size = resource_size(rsrc);



	*start = fixup_bigphys_addr(rsrc->start, size);

	*end = rsrc->start + size;

}



int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,

			enum pci_mmap_state mmap_state, int write_combine)

{

arch/powerpc/include/asm/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -136,9 +136,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, 
					 pgprot_t prot);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER

extern void pci_resource_to_user(const struct pci_dev *dev, int bar,

				 const struct resource *rsrc,

				 resource_size_t *start, resource_size_t *end);



extern resource_size_t pcibios_io_space_offset(struct pci_controller *hose);

extern void pcibios_setup_bus_devices(struct pci_bus *bus);

arch/sparc/include/asm/pci_64.h

+0 −3
Original line number Diff line number Diff line
@@ -55,9 +55,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
}



#define HAVE_ARCH_PCI_RESOURCE_TO_USER

void pci_resource_to_user(const struct pci_dev *dev, int bar,

			  const struct resource *rsrc,

			  resource_size_t *start, resource_size_t *end);

#endif /* __KERNEL__ */



#endif /* __SPARC64_PCI_H */