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

Delete pcibios_select_root

This function was only used by pci_claim_resource(), and the last commit
deleted that use.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Matthew Wilcox and committed by Linus Torvalds a6c14096 cebd78a8

-132
unified split
-13
arch/alpha/include/asm/pci.h
··· 237 237 extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 238 238 struct pci_bus_region *region); 239 239 240 - static inline struct resource * 241 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 242 - { 243 - struct resource *root = NULL; 244 - 245 - if (res->flags & IORESOURCE_IO) 246 - root = &ioport_resource; 247 - if (res->flags & IORESOURCE_MEM) 248 - root = &iomem_resource; 249 - 250 - return root; 251 - } 252 - 253 240 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index 254 241 255 242 static inline int pci_proc_domain(struct pci_bus *bus)
-13
arch/arm/include/asm/pci.h
··· 65 65 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 66 66 struct pci_bus_region *region); 67 67 68 - static inline struct resource * 69 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 70 - { 71 - struct resource *root = NULL; 72 - 73 - if (res->flags & IORESOURCE_IO) 74 - root = &ioport_resource; 75 - if (res->flags & IORESOURCE_MEM) 76 - root = &iomem_resource; 77 - 78 - return root; 79 - } 80 - 81 68 /* 82 69 * Dummy implementation; always return 0. 83 70 */
-13
arch/ia64/include/asm/pci.h
··· 135 135 extern void pcibios_bus_to_resource(struct pci_dev *dev, 136 136 struct resource *res, struct pci_bus_region *region); 137 137 138 - static inline struct resource * 139 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 140 - { 141 - struct resource *root = NULL; 142 - 143 - if (res->flags & IORESOURCE_IO) 144 - root = &ioport_resource; 145 - if (res->flags & IORESOURCE_MEM) 146 - root = &iomem_resource; 147 - 148 - return root; 149 - } 150 - 151 138 #define pcibios_scan_all_fns(a, b) 0 152 139 153 140 #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
-13
arch/mips/include/asm/pci.h
··· 142 142 extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 143 143 struct pci_bus_region *region); 144 144 145 - static inline struct resource * 146 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 147 - { 148 - struct resource *root = NULL; 149 - 150 - if (res->flags & IORESOURCE_IO) 151 - root = &ioport_resource; 152 - if (res->flags & IORESOURCE_MEM) 153 - root = &iomem_resource; 154 - 155 - return root; 156 - } 157 - 158 145 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index 159 146 160 147 static inline int pci_proc_domain(struct pci_bus *bus)
-13
arch/mn10300/include/asm/pci.h
··· 106 106 struct resource *res, 107 107 struct pci_bus_region *region); 108 108 109 - static inline struct resource * 110 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 111 - { 112 - struct resource *root = NULL; 113 - 114 - if (res->flags & IORESOURCE_IO) 115 - root = &ioport_resource; 116 - if (res->flags & IORESOURCE_MEM) 117 - root = &iomem_resource; 118 - 119 - return root; 120 - } 121 - 122 109 #define pcibios_scan_all_fns(a, b) 0 123 110 124 111 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
-13
arch/parisc/include/asm/pci.h
··· 268 268 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 269 269 struct pci_bus_region *region); 270 270 271 - static inline struct resource * 272 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 273 - { 274 - struct resource *root = NULL; 275 - 276 - if (res->flags & IORESOURCE_IO) 277 - root = &ioport_resource; 278 - if (res->flags & IORESOURCE_MEM) 279 - root = &iomem_resource; 280 - 281 - return root; 282 - } 283 - 284 271 static inline void pcibios_penalize_isa_irq(int irq, int active) 285 272 { 286 273 /* We don't need to penalize isa irq's */
-13
arch/powerpc/include/asm/pci.h
··· 195 195 struct resource *res, 196 196 struct pci_bus_region *region); 197 197 198 - static inline struct resource *pcibios_select_root(struct pci_dev *pdev, 199 - struct resource *res) 200 - { 201 - struct resource *root = NULL; 202 - 203 - if (res->flags & IORESOURCE_IO) 204 - root = &ioport_resource; 205 - if (res->flags & IORESOURCE_MEM) 206 - root = &iomem_resource; 207 - 208 - return root; 209 - } 210 - 211 198 extern void pcibios_claim_one_bus(struct pci_bus *b); 212 199 213 200 extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
-13
arch/sh/include/asm/pci.h
··· 137 137 extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 138 138 struct pci_bus_region *region); 139 139 140 - static inline struct resource * 141 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 142 - { 143 - struct resource *root = NULL; 144 - 145 - if (res->flags & IORESOURCE_IO) 146 - root = &ioport_resource; 147 - if (res->flags & IORESOURCE_MEM) 148 - root = &iomem_resource; 149 - 150 - return root; 151 - } 152 - 153 140 /* Chances are this interrupt is wired PC-style ... */ 154 141 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 155 142 {
-2
arch/sparc/include/asm/pci_64.h
··· 191 191 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 192 192 struct pci_bus_region *region); 193 193 194 - extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *); 195 - 196 194 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 197 195 { 198 196 return PCI_IRQ_NONE;
-13
arch/sparc/kernel/pci.c
··· 711 711 pbus->resource[1] = &pbm->mem_space; 712 712 } 713 713 714 - struct resource *pcibios_select_root(struct pci_dev *pdev, struct resource *r) 715 - { 716 - struct pci_pbm_info *pbm = pdev->bus->sysdata; 717 - struct resource *root = NULL; 718 - 719 - if (r->flags & IORESOURCE_IO) 720 - root = &pbm->io_space; 721 - if (r->flags & IORESOURCE_MEM) 722 - root = &pbm->mem_space; 723 - 724 - return root; 725 - } 726 - 727 714 void pcibios_update_irq(struct pci_dev *pdev, int irq) 728 715 { 729 716 }
-13
include/asm-generic/pci.h
··· 30 30 res->end = region->end; 31 31 } 32 32 33 - static inline struct resource * 34 - pcibios_select_root(struct pci_dev *pdev, struct resource *res) 35 - { 36 - struct resource *root = NULL; 37 - 38 - if (res->flags & IORESOURCE_IO) 39 - root = &ioport_resource; 40 - if (res->flags & IORESOURCE_MEM) 41 - root = &iomem_resource; 42 - 43 - return root; 44 - } 45 - 46 33 #define pcibios_scan_all_fns(a, b) 0 47 34 48 35 #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ