Skip to content

Commit c4f36c3

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'pci/header-cleanup-immutable'
- Remove pci_get_legacy_ide_irq(); use ATA_PRIMARY_IRQ() and ATA_SECONDARY_IRQ() instead (Stafford Horne) - Remove isa_dma_bridge_buggy, except for x86_32, the only place it's used (Stafford Horne) - Define ARCH_GENERIC_PCI_MMAP_RESOURCE for csky (Stafford Horne) - Move common PCI definitions that arches sometimes override to asm-generic/pci.h (Stafford Horne) - Include <linux/isa-dma.h> for 'isa_dma_bridge_buggy' when needed (bisection hole here) (Randy Dunlap) * pci/header-cleanup-immutable: PCI: Stub __pci_ioport_map() for arches that don't support it at all x86/cyrix: include header linux/isa-dma.h asm-generic: Add new pci.h and use it csky: PCI: Define ARCH_GENERIC_PCI_MMAP_RESOURCE PCI: Move isa_dma_bridge_buggy out of asm/dma.h PCI: Remove pci_get_legacy_ide_irq() and asm-generic/pci.h
2 parents 805f91b + 933c5a4 commit c4f36c3

File tree

39 files changed

+63
-246
lines changed

39 files changed

+63
-246
lines changed

‎arch/alpha/include/asm/dma.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -365,13 +365,4 @@ extern void free_dma(unsigned int dmanr); /* release it again */
365365
#define KERNEL_HAVE_CHECK_DMA
366366
extern int check_dma(unsigned int dmanr);
367367

368-
/* From PCI */
369-
370-
#ifdef CONFIG_PCI
371-
extern int isa_dma_bridge_buggy;
372-
#else
373-
#define isa_dma_bridge_buggy (0)
374-
#endif
375-
376-
377368
#endif /* _ASM_DMA_H */

‎arch/alpha/include/asm/pci.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ struct pci_controller {
5656

5757
/* IOMMU controls. */
5858

59-
/* TODO: integrate with include/asm-generic/pci.h ? */
60-
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
61-
{
62-
return channel ? 15 : 14;
63-
}
64-
6559
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
6660

6761
static inline int pci_proc_domain(struct pci_bus *bus)

‎arch/arc/include/asm/dma.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,5 @@
77
#define ASM_ARC_DMA_H
88

99
#define MAX_DMA_ADDRESS 0xC0000000
10-
#ifdef CONFIG_PCI
11-
extern int isa_dma_bridge_buggy;
12-
#else
13-
#define isa_dma_bridge_buggy 0
14-
#endif
1510

1611
#endif

‎arch/arm/include/asm/dma.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,4 @@ extern int get_dma_residue(unsigned int chan);
143143

144144
#endif /* CONFIG_ISA_DMA_API */
145145

146-
#ifdef CONFIG_PCI
147-
extern int isa_dma_bridge_buggy;
148-
#else
149-
#define isa_dma_bridge_buggy (0)
150-
#endif
151-
152146
#endif /* __ASM_ARM_DMA_H */

‎arch/arm/include/asm/pci.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
2222
#define HAVE_PCI_MMAP
2323
#define ARCH_GENERIC_PCI_MMAP_RESOURCE
2424

25-
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
26-
{
27-
return channel ? 15 : 14;
28-
}
29-
3025
extern void pcibios_report_status(unsigned int status_mask, int warn);
3126

3227
#endif /* __KERNEL__ */

‎arch/arm64/include/asm/pci.h

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <asm/io.h>
1010

1111
#define PCIBIOS_MIN_IO 0x1000
12-
#define PCIBIOS_MIN_MEM 0
1312

1413
/*
1514
* Set to 1 if the kernel should re-assign all PCI bus numbers
@@ -18,21 +17,8 @@
1817
(pci_has_flag(PCI_REASSIGN_ALL_BUS))
1918

2019
#define arch_can_pci_mmap_wc() 1
21-
#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1
2220

23-
extern int isa_dma_bridge_buggy;
24-
25-
#ifdef CONFIG_PCI
26-
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
27-
{
28-
/* no legacy IRQ on arm64 */
29-
return -ENODEV;
30-
}
31-
32-
static inline int pci_proc_domain(struct pci_bus *bus)
33-
{
34-
return 1;
35-
}
36-
#endif /* CONFIG_PCI */
21+
/* Generic PCI */
22+
#include <asm-generic/pci.h>
3723

3824
#endif /* __ASM_PCI_H */

‎arch/csky/include/asm/pci.h

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,7 @@
99

1010
#include <asm/io.h>
1111

12-
#define PCIBIOS_MIN_IO 0
13-
#define PCIBIOS_MIN_MEM 0
14-
15-
/* C-SKY shim does not initialize PCI bus */
16-
#define pcibios_assign_all_busses() 1
17-
18-
extern int isa_dma_bridge_buggy;
19-
20-
#ifdef CONFIG_PCI
21-
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
22-
{
23-
/* no legacy IRQ on csky */
24-
return -ENODEV;
25-
}
26-
27-
static inline int pci_proc_domain(struct pci_bus *bus)
28-
{
29-
/* always show the domain in /proc */
30-
return 1;
31-
}
32-
#endif /* CONFIG_PCI */
12+
/* Generic PCI */
13+
#include <asm-generic/pci.h>
3314

3415
#endif /* __ASM_CSKY_PCI_H */

‎arch/ia64/include/asm/dma.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
extern unsigned long MAX_DMA_ADDRESS;
1414

15-
extern int isa_dma_bridge_buggy;
16-
1715
#define free_dma(x)
1816

1917
#endif /* _ASM_IA64_DMA_H */

‎arch/ia64/include/asm/pci.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,4 @@ static inline int pci_proc_domain(struct pci_bus *bus)
6363
return (pci_domain_nr(bus) != 0);
6464
}
6565

66-
#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
67-
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
68-
{
69-
return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14);
70-
}
71-
7266
#endif /* _ASM_IA64_PCI_H */

‎arch/m68k/include/asm/dma.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,4 @@
66
bootmem allocator (but this should do it for this) */
77
#define MAX_DMA_ADDRESS PAGE_OFFSET
88

9-
#ifdef CONFIG_PCI
10-
extern int isa_dma_bridge_buggy;
11-
#else
12-
#define isa_dma_bridge_buggy (0)
13-
#endif
14-
159
#endif /* _M68K_DMA_H */

0 commit comments

Comments
 (0)