Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d59d36a7 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Remove unused pcibios_select_root() (again) 



a6c14096 ("Delete pcibios_select_root") removed pcibios_select_root().
But a7db5040 ("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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 633adc71

arch/ia64/include/asm/pci.h

+0 −13
Original line number Diff line number Diff line
@@ -108,19 +108,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
	return (pci_domain_nr(bus) != 0);

}



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 HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ

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

{

arch/microblaze/include/asm/pci.h

+0 −13
Original line number Diff line number Diff line
@@ -83,19 +83,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, 
 */

#define PCI_DMA_BUS_IS_PHYS     (1)



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_finish_adding_to_bus(struct pci_bus *bus);

arch/mn10300/include/asm/pci.h

+0 −13
Original line number Diff line number Diff line
@@ -83,19 +83,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
/* implement the pci_ DMA API in terms of the generic device dma_ one */

#include <asm-generic/pci-dma-compat.h>



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 int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

	return channel ? 15 : 14;

include/asm-generic/pci.h

+0 −13
Original line number Diff line number Diff line
@@ -6,19 +6,6 @@ 
#ifndef _ASM_GENERIC_PCI_H

#define _ASM_GENERIC_PCI_H



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;

}



#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ

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

{