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

Commit 11df1954 authored by David Woodhouse's avatar David Woodhouse Committed by Bjorn Helgaas
Browse files

PCI: Move multiple declarations of pci_mmap_page_range() to <linux/pci.h> 



We can declare it <linux/pci.h> even on platforms where it isn't going to
be defined.  There's no need to have it littered through the various
<asm/pci.h> files.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ae749c7a

arch/arm/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
#define PCI_DMA_BUS_IS_PHYS     (1)



#define HAVE_PCI_MMAP

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

                               enum pci_mmap_state mmap_state, int write_combine);



static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

arch/cris/include/asm/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ struct pci_dev; 
#define PCI_DMA_BUS_IS_PHYS	(1)



#define HAVE_PCI_MMAP

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

			       enum pci_mmap_state mmap_state, int write_combine);





#endif /* __KERNEL__ */

arch/ia64/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ extern unsigned long ia64_max_iommu_merge_mask; 
#define HAVE_PCI_MMAP

#define arch_can_pci_mmap_wc()	1



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

				enum pci_mmap_state mmap_state, int write_combine);

#define HAVE_PCI_LEGACY

extern int pci_mmap_legacy_page_range(struct pci_bus *bus,

				      struct vm_area_struct *vma,

arch/microblaze/include/asm/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ extern int pci_domain_nr(struct pci_bus *bus); 
extern int pci_proc_domain(struct pci_bus *bus);



struct vm_area_struct;

/* Map a range of PCI memory or I/O space for a device into user space */

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

			enum pci_mmap_state mmap_state, int write_combine);



/* Tell drivers/pci/proc.c that we have pci_mmap_page_range() */

#define HAVE_PCI_MMAP	1

arch/mips/include/asm/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ extern void pcibios_set_master(struct pci_dev *dev); 


#define HAVE_PCI_MMAP



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

	enum pci_mmap_state mmap_state, int write_combine);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER



/*