aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-06-04 17:38:17 -0400
committerBjorn Helgaas <bhelgaas@google.com>2015-06-08 08:56:43 -0400
commit01d72a95188880b22190e937ed8718ed4b45bdce (patch)
tree0cfcd115d2beb8c22a9cae362881c1afbaf444ed
parentd59d36a7fce6707acae644621320a75ab93f1856 (diff)
PCI: Remove unused pci_dma_burst_advice()
pci_dma_burst_advice() was added by e24c2d963a60 ("[PATCH] PCI: DMA bursting advice") but apparently never used. Remove it. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Michal Simek <monstr@monstr.eu> # microblaze CC: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/alpha/include/asm/pci.h16
-rw-r--r--arch/arm/include/asm/pci.h10
-rw-r--r--arch/frv/include/asm/pci.h10
-rw-r--r--arch/ia64/include/asm/pci.h19
-rw-r--r--arch/microblaze/include/asm/pci.h10
-rw-r--r--arch/mips/include/asm/pci.h10
-rw-r--r--arch/parisc/include/asm/pci.h19
-rw-r--r--arch/powerpc/include/asm/pci.h30
-rw-r--r--arch/sh/include/asm/pci.h18
-rw-r--r--arch/sparc/include/asm/pci_32.h10
-rw-r--r--arch/sparc/include/asm/pci_64.h19
-rw-r--r--arch/unicore32/include/asm/pci.h10
-rw-r--r--arch/x86/include/asm/pci.h7
-rw-r--r--drivers/net/ethernet/sun/cassini.c1
-rw-r--r--include/linux/pci.h11
15 files changed, 0 insertions, 200 deletions
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index f7f680f7457d..8b02afeb6319 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -71,22 +71,6 @@ extern void pcibios_set_master(struct pci_dev *dev);
71/* implement the pci_ DMA API in terms of the generic device dma_ one */ 71/* implement the pci_ DMA API in terms of the generic device dma_ one */
72#include <asm-generic/pci-dma-compat.h> 72#include <asm-generic/pci-dma-compat.h>
73 73
74static inline void pci_dma_burst_advice(struct pci_dev *pdev,
75 enum pci_dma_burst_strategy *strat,
76 unsigned long *strategy_parameter)
77{
78 unsigned long cacheline_size;
79 u8 byte;
80
81 pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
82 if (byte == 0)
83 cacheline_size = 1024;
84 else
85 cacheline_size = (int) byte * 4;
86
87 *strat = PCI_DMA_BURST_BOUNDARY;
88 *strategy_parameter = cacheline_size;
89}
90#endif 74#endif
91 75
92/* TODO: integrate with include/asm-generic/pci.h ? */ 76/* TODO: integrate with include/asm-generic/pci.h ? */
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index 585dc33a7a24..a5635444ca41 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -31,16 +31,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
31 */ 31 */
32#define PCI_DMA_BUS_IS_PHYS (1) 32#define PCI_DMA_BUS_IS_PHYS (1)
33 33
34#ifdef CONFIG_PCI
35static inline void pci_dma_burst_advice(struct pci_dev *pdev,
36 enum pci_dma_burst_strategy *strat,
37 unsigned long *strategy_parameter)
38{
39 *strat = PCI_DMA_BURST_INFINITY;
40 *strategy_parameter = ~0UL;
41}
42#endif
43
44#define HAVE_PCI_MMAP 34#define HAVE_PCI_MMAP
45extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 35extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
46 enum pci_mmap_state mmap_state, int write_combine); 36 enum pci_mmap_state mmap_state, int write_combine);
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index 2035a4d3f9b9..a6d4ed042c70 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -41,16 +41,6 @@ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size,
41/* Return the index of the PCI controller for device PDEV. */ 41/* Return the index of the PCI controller for device PDEV. */
42#define pci_controller_num(PDEV) (0) 42#define pci_controller_num(PDEV) (0)
43 43
44#ifdef CONFIG_PCI
45static inline void pci_dma_burst_advice(struct pci_dev *pdev,
46 enum pci_dma_burst_strategy *strat,
47 unsigned long *strategy_parameter)
48{
49 *strat = PCI_DMA_BURST_INFINITY;
50 *strategy_parameter = ~0UL;
51}
52#endif
53
54/* 44/*
55 * These are pretty much arbitrary with the CoMEM implementation. 45 * These are pretty much arbitrary with the CoMEM implementation.
56 * We have the whole address space to ourselves. 46 * We have the whole address space to ourselves.
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 32ea19ac5713..b897fae1f0ca 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -52,25 +52,6 @@ extern unsigned long ia64_max_iommu_merge_mask;
52 52
53#include <asm-generic/pci-dma-compat.h> 53#include <asm-generic/pci-dma-compat.h>
54 54
55#ifdef CONFIG_PCI
56static inline void pci_dma_burst_advice(struct pci_dev *pdev,
57 enum pci_dma_burst_strategy *strat,
58 unsigned long *strategy_parameter)
59{
60 unsigned long cacheline_size;
61 u8 byte;
62
63 pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
64 if (byte == 0)
65 cacheline_size = 1024;
66 else
67 cacheline_size = (int) byte * 4;
68
69 *strat = PCI_DMA_BURST_MULTIPLE;
70 *strategy_parameter = cacheline_size;
71}
72#endif
73
74#define HAVE_PCI_MMAP 55#define HAVE_PCI_MMAP
75extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma, 56extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
76 enum pci_mmap_state mmap_state, int write_combine); 57 enum pci_mmap_state mmap_state, int write_combine);
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 95b03886e0a8..fdf2e75d7033 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -44,16 +44,6 @@ struct pci_dev;
44 */ 44 */
45#define pcibios_assign_all_busses() 0 45#define pcibios_assign_all_busses() 0
46 46
47#ifdef CONFIG_PCI
48static inline void pci_dma_burst_advice(struct pci_dev *pdev,
49 enum pci_dma_burst_strategy *strat,
50 unsigned long *strategy_parameter)
51{
52 *strat = PCI_DMA_BURST_INFINITY;
53 *strategy_parameter = ~0UL;
54}
55#endif
56
57extern int pci_domain_nr(struct pci_bus *bus); 47extern int pci_domain_nr(struct pci_bus *bus);
58 48
59/* Decide whether to display the domain number in /proc */ 49/* Decide whether to display the domain number in /proc */
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index d9692993fc83..70dcc5498128 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -113,16 +113,6 @@ struct pci_dev;
113 */ 113 */
114extern unsigned int PCI_DMA_BUS_IS_PHYS; 114extern unsigned int PCI_DMA_BUS_IS_PHYS;
115 115
116#ifdef CONFIG_PCI
117static inline void pci_dma_burst_advice(struct pci_dev *pdev,
118 enum pci_dma_burst_strategy *strat,
119 unsigned long *strategy_parameter)
120{
121 *strat = PCI_DMA_BURST_INFINITY;
122 *strategy_parameter = ~0UL;
123}
124#endif
125
126#ifdef CONFIG_PCI_DOMAINS 116#ifdef CONFIG_PCI_DOMAINS
127#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index 117#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
128 118
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h
index 20df2b04fc09..bf5e044281d6 100644
--- a/arch/parisc/include/asm/pci.h
+++ b/arch/parisc/include/asm/pci.h
@@ -196,25 +196,6 @@ static inline void pcibios_register_hba(struct pci_hba_data *x)
196/* export the pci_ DMA API in terms of the dma_ one */ 196/* export the pci_ DMA API in terms of the dma_ one */
197#include <asm-generic/pci-dma-compat.h> 197#include <asm-generic/pci-dma-compat.h>
198 198
199#ifdef CONFIG_PCI
200static inline void pci_dma_burst_advice(struct pci_dev *pdev,
201 enum pci_dma_burst_strategy *strat,
202 unsigned long *strategy_parameter)
203{
204 unsigned long cacheline_size;
205 u8 byte;
206
207 pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
208 if (byte == 0)
209 cacheline_size = 1024;
210 else
211 cacheline_size = (int) byte * 4;
212
213 *strat = PCI_DMA_BURST_MULTIPLE;
214 *strategy_parameter = cacheline_size;
215}
216#endif
217
218static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 199static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
219{ 200{
220 return channel ? 15 : 14; 201 return channel ? 15 : 14;
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index 4aef8d660999..99dc432b256a 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -71,36 +71,6 @@ extern struct dma_map_ops *get_pci_dma_ops(void);
71 */ 71 */
72#define PCI_DISABLE_MWI 72#define PCI_DISABLE_MWI
73 73
74#ifdef CONFIG_PCI
75static inline void pci_dma_burst_advice(struct pci_dev *pdev,
76 enum pci_dma_burst_strategy *strat,
77 unsigned long *strategy_parameter)
78{
79 unsigned long cacheline_size;
80 u8 byte;
81
82 pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
83 if (byte == 0)
84 cacheline_size = 1024;
85 else
86 cacheline_size = (int) byte * 4;
87
88 *strat = PCI_DMA_BURST_MULTIPLE;
89 *strategy_parameter = cacheline_size;
90}
91#endif
92
93#else /* 32-bit */
94
95#ifdef CONFIG_PCI
96static inline void pci_dma_burst_advice(struct pci_dev *pdev,
97 enum pci_dma_burst_strategy *strat,
98 unsigned long *strategy_parameter)
99{
100 *strat = PCI_DMA_BURST_INFINITY;
101 *strategy_parameter = ~0UL;
102}
103#endif
104#endif /* CONFIG_PPC64 */ 74#endif /* CONFIG_PPC64 */
105 75
106extern int pci_domain_nr(struct pci_bus *bus); 76extern int pci_domain_nr(struct pci_bus *bus);
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 5b4511552998..e343dbd02e41 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -86,24 +86,6 @@ extern void pcibios_set_master(struct pci_dev *dev);
86 * direct memory write. 86 * direct memory write.
87 */ 87 */
88#define PCI_DISABLE_MWI 88#define PCI_DISABLE_MWI
89
90static inline void pci_dma_burst_advice(struct pci_dev *pdev,
91 enum pci_dma_burst_strategy *strat,
92 unsigned long *strategy_parameter)
93{
94 unsigned long cacheline_size;
95 u8 byte;
96
97 pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
98
99 if (byte == 0)
100 cacheline_size = L1_CACHE_BYTES;
101 else
102 cacheline_size = byte << 2;
103
104 *strat = PCI_DMA_BURST_MULTIPLE;
105 *strategy_parameter = cacheline_size;
106}
107#endif 89#endif
108 90
109/* Board-specific fixup routines. */ 91/* Board-specific fixup routines. */
diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h
index 53e9b4987db0..b7c092df3134 100644
--- a/arch/sparc/include/asm/pci_32.h
+++ b/arch/sparc/include/asm/pci_32.h
@@ -22,16 +22,6 @@
22 22
23struct pci_dev; 23struct pci_dev;
24 24
25#ifdef CONFIG_PCI
26static inline void pci_dma_burst_advice(struct pci_dev *pdev,
27 enum pci_dma_burst_strategy *strat,
28 unsigned long *strategy_parameter)
29{
30 *strat = PCI_DMA_BURST_INFINITY;
31 *strategy_parameter = ~0UL;
32}
33#endif
34
35#endif /* __KERNEL__ */ 25#endif /* __KERNEL__ */
36 26
37#ifndef CONFIG_LEON_PCI 27#ifndef CONFIG_LEON_PCI
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index bd00a6226169..022d16008a00 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -31,25 +31,6 @@
31#define PCI64_REQUIRED_MASK (~(u64)0) 31#define PCI64_REQUIRED_MASK (~(u64)0)
32#define PCI64_ADDR_BASE 0xfffc000000000000UL 32#define PCI64_ADDR_BASE 0xfffc000000000000UL
33 33
34#ifdef CONFIG_PCI
35static inline void pci_dma_burst_advice(struct pci_dev *pdev,
36 enum pci_dma_burst_strategy *strat,
37 unsigned long *strategy_parameter)
38{
39 unsigned long cacheline_size;
40 u8 byte;
41
42 pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &byte);
43 if (byte == 0)
44 cacheline_size = 1024;
45 else
46 cacheline_size = (int) byte * 4;
47
48 *strat = PCI_DMA_BURST_BOUNDARY;
49 *strategy_parameter = cacheline_size;
50}
51#endif
52
53/* Return the index of the PCI controller for device PDEV. */ 34/* Return the index of the PCI controller for device PDEV. */
54 35
55int pci_domain_nr(struct pci_bus *bus); 36int pci_domain_nr(struct pci_bus *bus);
diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h
index 654407e98619..38b3f3785c3c 100644
--- a/arch/unicore32/include/asm/pci.h
+++ b/arch/unicore32/include/asm/pci.h
@@ -18,16 +18,6 @@
18#include <asm-generic/pci.h> 18#include <asm-generic/pci.h>
19#include <mach/hardware.h> /* for PCIBIOS_MIN_* */ 19#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
20 20
21#ifdef CONFIG_PCI
22static inline void pci_dma_burst_advice(struct pci_dev *pdev,
23 enum pci_dma_burst_strategy *strat,
24 unsigned long *strategy_parameter)
25{
26 *strat = PCI_DMA_BURST_INFINITY;
27 *strategy_parameter = ~0UL;
28}
29#endif
30
31#define HAVE_PCI_MMAP 21#define HAVE_PCI_MMAP
32extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 22extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
33 enum pci_mmap_state mmap_state, int write_combine); 23 enum pci_mmap_state mmap_state, int write_combine);
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 4e370a5d8117..e51c229a29a4 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -80,13 +80,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
80 80
81#ifdef CONFIG_PCI 81#ifdef CONFIG_PCI
82extern void early_quirks(void); 82extern void early_quirks(void);
83static inline void pci_dma_burst_advice(struct pci_dev *pdev,
84 enum pci_dma_burst_strategy *strat,
85 unsigned long *strategy_parameter)
86{
87 *strat = PCI_DMA_BURST_INFINITY;
88 *strategy_parameter = ~0UL;
89}
90#else 83#else
91static inline void early_quirks(void) { } 84static inline void early_quirks(void) { }
92#endif 85#endif
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 3dc1f68b322d..6ce973187225 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -3058,7 +3058,6 @@ static void cas_init_mac(struct cas *cp)
3058 /* setup core arbitration weight register */ 3058 /* setup core arbitration weight register */
3059 writel(CAWR_RR_DIS, cp->regs + REG_CAWR); 3059 writel(CAWR_RR_DIS, cp->regs + REG_CAWR);
3060 3060
3061 /* XXX Use pci_dma_burst_advice() */
3062#if !defined(CONFIG_SPARC64) && !defined(CONFIG_ALPHA) 3061#if !defined(CONFIG_SPARC64) && !defined(CONFIG_ALPHA)
3063 /* set the infinite burst register for chips that don't have 3062 /* set the infinite burst register for chips that don't have
3064 * pci issues. 3063 * pci issues.
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 353db8dc4c6e..08fb4e307d68 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1197,15 +1197,6 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,
1197#define pci_pool_alloc(pool, flags, handle) dma_pool_alloc(pool, flags, handle) 1197#define pci_pool_alloc(pool, flags, handle) dma_pool_alloc(pool, flags, handle)
1198#define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, addr) 1198#define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, addr)
1199 1199
1200enum pci_dma_burst_strategy {
1201 PCI_DMA_BURST_INFINITY, /* make bursts as large as possible,
1202 strategy_parameter is N/A */
1203 PCI_DMA_BURST_BOUNDARY, /* disconnect at every strategy_parameter
1204 byte boundaries */
1205 PCI_DMA_BURST_MULTIPLE, /* disconnect at some multiple of
1206 strategy_parameter byte boundaries */
1207};
1208
1209struct msix_entry { 1200struct msix_entry {
1210 u32 vector; /* kernel uses to write allocated vector */ 1201 u32 vector; /* kernel uses to write allocated vector */
1211 u16 entry; /* driver uses to specify entry, OS writes */ 1202 u16 entry; /* driver uses to specify entry, OS writes */
@@ -1430,8 +1421,6 @@ static inline int pci_request_regions(struct pci_dev *dev, const char *res_name)
1430{ return -EIO; } 1421{ return -EIO; }
1431static inline void pci_release_regions(struct pci_dev *dev) { } 1422static inline void pci_release_regions(struct pci_dev *dev) { }
1432 1423
1433#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
1434
1435static inline void pci_block_cfg_access(struct pci_dev *dev) { } 1424static inline void pci_block_cfg_access(struct pci_dev *dev) { }
1436static inline int pci_block_cfg_access_in_atomic(struct pci_dev *dev) 1425static inline int pci_block_cfg_access_in_atomic(struct pci_dev *dev)
1437{ return 0; } 1426{ return 0; }