Skip to content

Commit a6c1409

Browse files
Matthew Wilcoxtorvalds
Matthew Wilcox
authored and
torvalds
committed
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 <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent cebd78a commit a6c1409

File tree

11 files changed

+0
-132
lines changed

11 files changed

+0
-132
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -237,19 +237,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *, struct pci_bus_region *,
237237
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
238238
struct pci_bus_region *region);
239239

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-
253240
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
254241

255242
static inline int pci_proc_domain(struct pci_bus *bus)

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,6 @@ extern void
6565
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
6666
struct pci_bus_region *region);
6767

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-
8168
/*
8269
* Dummy implementation; always return 0.
8370
*/

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev,
135135
extern void pcibios_bus_to_resource(struct pci_dev *dev,
136136
struct resource *res, struct pci_bus_region *region);
137137

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-
151138
#define pcibios_scan_all_fns(a, b) 0
152139

153140
#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev,
142142
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
143143
struct pci_bus_region *region);
144144

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-
158145
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
159146

160147
static inline int pci_proc_domain(struct pci_bus *bus)

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev,
106106
struct resource *res,
107107
struct pci_bus_region *region);
108108

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-
122109
#define pcibios_scan_all_fns(a, b) 0
123110

124111
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -268,19 +268,6 @@ extern void
268268
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
269269
struct pci_bus_region *region);
270270

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-
284271
static inline void pcibios_penalize_isa_irq(int irq, int active)
285272
{
286273
/* We don't need to penalize isa irq's */

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,19 +195,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev,
195195
struct resource *res,
196196
struct pci_bus_region *region);
197197

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-
211198
extern void pcibios_claim_one_bus(struct pci_bus *b);
212199

213200
extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,19 +137,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev,
137137
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
138138
struct pci_bus_region *region);
139139

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-
153140
/* Chances are this interrupt is wired PC-style ... */
154141
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
155142
{

‎arch/sparc/include/asm/pci_64.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ extern void
191191
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
192192
struct pci_bus_region *region);
193193

194-
extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *);
195-
196194
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
197195
{
198196
return PCI_IRQ_NONE;

‎arch/sparc/kernel/pci.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -711,19 +711,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus)
711711
pbus->resource[1] = &pbm->mem_space;
712712
}
713713

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-
727714
void pcibios_update_irq(struct pci_dev *pdev, int irq)
728715
{
729716
}

‎include/asm-generic/pci.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,6 @@ pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
3030
res->end = region->end;
3131
}
3232

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-
4633
#define pcibios_scan_all_fns(a, b) 0
4734

4835
#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ

0 commit comments

Comments
 (0)