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>
This commit is contained in:
Родитель
cebd78a8c5
Коммит
a6c140969b
|
@ -237,19 +237,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *, struct pci_bus_region *,
|
||||||
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
|
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
|
||||||
|
|
||||||
static inline int pci_proc_domain(struct pci_bus *bus)
|
static inline int pci_proc_domain(struct pci_bus *bus)
|
||||||
|
|
|
@ -65,19 +65,6 @@ extern void
|
||||||
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Dummy implementation; always return 0.
|
* Dummy implementation; always return 0.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -135,19 +135,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev,
|
||||||
extern void pcibios_bus_to_resource(struct pci_dev *dev,
|
extern void pcibios_bus_to_resource(struct pci_dev *dev,
|
||||||
struct resource *res, struct pci_bus_region *region);
|
struct resource *res, struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define pcibios_scan_all_fns(a, b) 0
|
#define pcibios_scan_all_fns(a, b) 0
|
||||||
|
|
||||||
#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
|
#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
|
||||||
|
|
|
@ -142,19 +142,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev,
|
||||||
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
|
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
|
||||||
|
|
||||||
static inline int pci_proc_domain(struct pci_bus *bus)
|
static inline int pci_proc_domain(struct pci_bus *bus)
|
||||||
|
|
|
@ -106,19 +106,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev,
|
||||||
struct resource *res,
|
struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define pcibios_scan_all_fns(a, b) 0
|
#define pcibios_scan_all_fns(a, b) 0
|
||||||
|
|
||||||
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
|
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
|
||||||
|
|
|
@ -268,19 +268,6 @@ extern void
|
||||||
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void pcibios_penalize_isa_irq(int irq, int active)
|
static inline void pcibios_penalize_isa_irq(int irq, int active)
|
||||||
{
|
{
|
||||||
/* We don't need to penalize isa irq's */
|
/* We don't need to penalize isa irq's */
|
||||||
|
|
|
@ -195,19 +195,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev,
|
||||||
struct resource *res,
|
struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *pcibios_select_root(struct pci_dev *pdev,
|
|
||||||
struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
extern void pcibios_claim_one_bus(struct pci_bus *b);
|
extern void pcibios_claim_one_bus(struct pci_bus *b);
|
||||||
|
|
||||||
extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
|
extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
|
||||||
|
|
|
@ -137,19 +137,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev,
|
||||||
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Chances are this interrupt is wired PC-style ... */
|
/* Chances are this interrupt is wired PC-style ... */
|
||||||
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
|
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
|
||||||
{
|
{
|
||||||
|
|
|
@ -191,8 +191,6 @@ extern void
|
||||||
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
||||||
struct pci_bus_region *region);
|
struct pci_bus_region *region);
|
||||||
|
|
||||||
extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *);
|
|
||||||
|
|
||||||
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
|
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
|
||||||
{
|
{
|
||||||
return PCI_IRQ_NONE;
|
return PCI_IRQ_NONE;
|
||||||
|
|
|
@ -711,19 +711,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus)
|
||||||
pbus->resource[1] = &pbm->mem_space;
|
pbus->resource[1] = &pbm->mem_space;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct resource *pcibios_select_root(struct pci_dev *pdev, struct resource *r)
|
|
||||||
{
|
|
||||||
struct pci_pbm_info *pbm = pdev->bus->sysdata;
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (r->flags & IORESOURCE_IO)
|
|
||||||
root = &pbm->io_space;
|
|
||||||
if (r->flags & IORESOURCE_MEM)
|
|
||||||
root = &pbm->mem_space;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
void pcibios_update_irq(struct pci_dev *pdev, int irq)
|
void pcibios_update_irq(struct pci_dev *pdev, int irq)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,19 +30,6 @@ pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
|
||||||
res->end = region->end;
|
res->end = region->end;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline struct resource *
|
|
||||||
pcibios_select_root(struct pci_dev *pdev, struct resource *res)
|
|
||||||
{
|
|
||||||
struct resource *root = NULL;
|
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO)
|
|
||||||
root = &ioport_resource;
|
|
||||||
if (res->flags & IORESOURCE_MEM)
|
|
||||||
root = &iomem_resource;
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define pcibios_scan_all_fns(a, b) 0
|
#define pcibios_scan_all_fns(a, b) 0
|
||||||
|
|
||||||
#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
|
#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
|
||||||
|
|
Загрузка…
Ссылка в новой задаче