Skip to content

Commit d59d36a

Browse files
committed
PCI: Remove unused pcibios_select_root() (again)
a6c1409 ("Delete pcibios_select_root") removed pcibios_select_root(). But a7db504 ("PCI: remove pcibios_scan_all_fns()") added a few copies back, probably with some incorrect merge conflict resolutions. Remove the still-unused pcibios_select_root() definitions. Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 633adc7 commit d59d36a

File tree

4 files changed

+0
-52
lines changed
  • arch
  • include/asm-generic

4 files changed

+0
-52
lines changed

arch/ia64/include/asm/pci.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
108108
return (pci_domain_nr(bus) != 0);
109109
}
110110

111-
static inline struct resource *
112-
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
113-
{
114-
struct resource *root = NULL;
115-
116-
if (res->flags & IORESOURCE_IO)
117-
root = &ioport_resource;
118-
if (res->flags & IORESOURCE_MEM)
119-
root = &iomem_resource;
120-
121-
return root;
122-
}
123-
124111
#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
125112
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
126113
{

arch/microblaze/include/asm/pci.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
8383
*/
8484
#define PCI_DMA_BUS_IS_PHYS (1)
8585

86-
static inline struct resource *pcibios_select_root(struct pci_dev *pdev,
87-
struct resource *res)
88-
{
89-
struct resource *root = NULL;
90-
91-
if (res->flags & IORESOURCE_IO)
92-
root = &ioport_resource;
93-
if (res->flags & IORESOURCE_MEM)
94-
root = &iomem_resource;
95-
96-
return root;
97-
}
98-
9986
extern void pcibios_claim_one_bus(struct pci_bus *b);
10087

10188
extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);

arch/mn10300/include/asm/pci.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
8383
/* implement the pci_ DMA API in terms of the generic device dma_ one */
8484
#include <asm-generic/pci-dma-compat.h>
8585

86-
static inline struct resource *
87-
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
88-
{
89-
struct resource *root = NULL;
90-
91-
if (res->flags & IORESOURCE_IO)
92-
root = &ioport_resource;
93-
if (res->flags & IORESOURCE_MEM)
94-
root = &iomem_resource;
95-
96-
return root;
97-
}
98-
9986
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
10087
{
10188
return channel ? 15 : 14;

include/asm-generic/pci.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,6 @@
66
#ifndef _ASM_GENERIC_PCI_H
77
#define _ASM_GENERIC_PCI_H
88

9-
static inline struct resource *
10-
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
11-
{
12-
struct resource *root = NULL;
13-
14-
if (res->flags & IORESOURCE_IO)
15-
root = &ioport_resource;
16-
if (res->flags & IORESOURCE_MEM)
17-
root = &iomem_resource;
18-
19-
return root;
20-
}
21-
229
#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
2310
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
2411
{

0 commit comments

Comments
 (0)