Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

-200
-16
arch/alpha/include/asm/pci.h
··· 71 71 /* implement the pci_ DMA API in terms of the generic device dma_ one */ 72 72 #include <asm-generic/pci-dma-compat.h> 73 73 74 - static 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 74 #endif 91 75 92 76 /* TODO: integrate with include/asm-generic/pci.h ? */
-10
arch/arm/include/asm/pci.h
··· 31 31 */ 32 32 #define PCI_DMA_BUS_IS_PHYS (1) 33 33 34 - #ifdef CONFIG_PCI 35 - static 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 34 #define HAVE_PCI_MMAP 45 35 extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 46 36 enum pci_mmap_state mmap_state, int write_combine);
-10
arch/frv/include/asm/pci.h
··· 41 41 /* Return the index of the PCI controller for device PDEV. */ 42 42 #define pci_controller_num(PDEV) (0) 43 43 44 - #ifdef CONFIG_PCI 45 - static 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 45 * These are pretty much arbitrary with the CoMEM implementation. 56 46 * We have the whole address space to ourselves.
-19
arch/ia64/include/asm/pci.h
··· 52 52 53 53 #include <asm-generic/pci-dma-compat.h> 54 54 55 - #ifdef CONFIG_PCI 56 - static 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 55 #define HAVE_PCI_MMAP 75 56 extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma, 76 57 enum pci_mmap_state mmap_state, int write_combine);
-10
arch/microblaze/include/asm/pci.h
··· 44 44 */ 45 45 #define pcibios_assign_all_busses() 0 46 46 47 - #ifdef CONFIG_PCI 48 - static 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 - 57 47 extern int pci_domain_nr(struct pci_bus *bus); 58 48 59 49 /* Decide whether to display the domain number in /proc */
-10
arch/mips/include/asm/pci.h
··· 113 113 */ 114 114 extern unsigned int PCI_DMA_BUS_IS_PHYS; 115 115 116 - #ifdef CONFIG_PCI 117 - static 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 116 #ifdef CONFIG_PCI_DOMAINS 127 117 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index 128 118
-19
arch/parisc/include/asm/pci.h
··· 196 196 /* export the pci_ DMA API in terms of the dma_ one */ 197 197 #include <asm-generic/pci-dma-compat.h> 198 198 199 - #ifdef CONFIG_PCI 200 - static 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 - 218 199 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 219 200 { 220 201 return channel ? 15 : 14;
-30
arch/powerpc/include/asm/pci.h
··· 71 71 */ 72 72 #define PCI_DISABLE_MWI 73 73 74 - #ifdef CONFIG_PCI 75 - static 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 96 - static 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 74 #endif /* CONFIG_PPC64 */ 105 75 106 76 extern int pci_domain_nr(struct pci_bus *bus);
-18
arch/sh/include/asm/pci.h
··· 86 86 * direct memory write. 87 87 */ 88 88 #define PCI_DISABLE_MWI 89 - 90 - static 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 89 #endif 108 90 109 91 /* Board-specific fixup routines. */
-10
arch/sparc/include/asm/pci_32.h
··· 22 22 23 23 struct pci_dev; 24 24 25 - #ifdef CONFIG_PCI 26 - static 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 25 #endif /* __KERNEL__ */ 36 26 37 27 #ifndef CONFIG_LEON_PCI
-19
arch/sparc/include/asm/pci_64.h
··· 31 31 #define PCI64_REQUIRED_MASK (~(u64)0) 32 32 #define PCI64_ADDR_BASE 0xfffc000000000000UL 33 33 34 - #ifdef CONFIG_PCI 35 - static 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 34 /* Return the index of the PCI controller for device PDEV. */ 54 35 55 36 int pci_domain_nr(struct pci_bus *bus);
-10
arch/unicore32/include/asm/pci.h
··· 18 18 #include <asm-generic/pci.h> 19 19 #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ 20 20 21 - #ifdef CONFIG_PCI 22 - static 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 21 #define HAVE_PCI_MMAP 32 22 extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 33 23 enum pci_mmap_state mmap_state, int write_combine);
-7
arch/x86/include/asm/pci.h
··· 80 80 81 81 #ifdef CONFIG_PCI 82 82 extern void early_quirks(void); 83 - static 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 83 #else 91 84 static inline void early_quirks(void) { } 92 85 #endif
-1
drivers/net/ethernet/sun/cassini.c
··· 3058 3058 /* setup core arbitration weight register */ 3059 3059 writel(CAWR_RR_DIS, cp->regs + REG_CAWR); 3060 3060 3061 - /* XXX Use pci_dma_burst_advice() */ 3062 3061 #if !defined(CONFIG_SPARC64) && !defined(CONFIG_ALPHA) 3063 3062 /* set the infinite burst register for chips that don't have 3064 3063 * pci issues.
-11
include/linux/pci.h
··· 1197 1197 #define pci_pool_alloc(pool, flags, handle) dma_pool_alloc(pool, flags, handle) 1198 1198 #define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, addr) 1199 1199 1200 - enum 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 - 1209 1200 struct msix_entry { 1210 1201 u32 vector; /* kernel uses to write allocated vector */ 1211 1202 u16 entry; /* driver uses to specify entry, OS writes */ ··· 1420 1429 static inline int pci_request_regions(struct pci_dev *dev, const char *res_name) 1421 1430 { return -EIO; } 1422 1431 static inline void pci_release_regions(struct pci_dev *dev) { } 1423 - 1424 - #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) 1425 1432 1426 1433 static inline void pci_block_cfg_access(struct pci_dev *dev) { } 1427 1434 static inline int pci_block_cfg_access_in_atomic(struct pci_dev *dev)