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

Commit d7c4f1b7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Arnd Bergmann
Browse files

asm-generic: make pci.h usable directly 



Some generic code is using the horribly misnamed PCI_DMA_BUS_IS_PHYS
from asm/pci.h. This makes sure that an architecture without PCI
support does not have to define this itself but can rely on the
asm-generic version.

Signed-off-by: default avatarRemis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 3aef3928

arch/frv/include/asm/pci.h

+3 −10
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#ifndef ASM_PCI_H

#define	ASM_PCI_H

#ifndef _ASM_FRV_PCI_H

#define _ASM_FRV_PCI_H



#include <linux/mm.h>

#include <asm/scatterlist.h>
@@ -43,12 +43,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, 
/* Return the index of the PCI controller for device PDEV. */

#define pci_controller_num(PDEV)	(0)



/* The PCI address space does equal the physical memory

 * address space.  The networking and block device layers use

 * this boolean for bounce buffer decisions.

 */

#define PCI_DMA_BUS_IS_PHYS	(1)



/* pci_unmap_{page,single} is a nop so... */

#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
@@ -114,5 +108,4 @@ static inline void pci_dma_sync_sg(struct pci_dev *hwdev, 
				    sg_dma_address(&sg[i])+sg_dma_len(&sg[i]));

}





#endif
 
#endif /* _ASM_FRV_PCI_H */

arch/m32r/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -3,6 +3,4 @@ 


#include <asm-generic/pci.h>



#define PCI_DMA_BUS_IS_PHYS	(1)



#endif /* _ASM_M32R_PCI_H */

include/asm-generic/pci.h

+8 −0
Original line number Diff line number Diff line
@@ -52,4 +52,12 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
}

#endif /* HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ */



/*

 * By default, assume that no iommu is in use and that the PCI

 * space is mapped to address physical 0.

 */

#ifndef PCI_DMA_BUS_IS_PHYS

#define PCI_DMA_BUS_IS_PHYS	(1)

#endif



#endif /* _ASM_GENERIC_PCI_H */