Commit ae14e13a authored by Grant Likely's avatar Grant Likely Committed by Benjamin Herrenschmidt

powerpc/pci: Remove dead checks for CONFIG_PPC_OF

PPC_OF is always selected for arch/powerpc.  This patch removes the stale
#defines
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent bb1af71e
...@@ -176,8 +176,6 @@ int pci_domain_nr(struct pci_bus *bus) ...@@ -176,8 +176,6 @@ int pci_domain_nr(struct pci_bus *bus)
} }
EXPORT_SYMBOL(pci_domain_nr); EXPORT_SYMBOL(pci_domain_nr);
#ifdef CONFIG_PPC_OF
/* This routine is meant to be used early during boot, when the /* This routine is meant to be used early during boot, when the
* PCI bus numbers have not yet been assigned, and you need to * PCI bus numbers have not yet been assigned, and you need to
* issue PCI config cycles to an OF device. * issue PCI config cycles to an OF device.
...@@ -210,17 +208,11 @@ static ssize_t pci_show_devspec(struct device *dev, ...@@ -210,17 +208,11 @@ static ssize_t pci_show_devspec(struct device *dev,
return sprintf(buf, "%s", np->full_name); return sprintf(buf, "%s", np->full_name);
} }
static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL); static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);
#endif /* CONFIG_PPC_OF */
/* Add sysfs properties */ /* Add sysfs properties */
int pcibios_add_platform_entries(struct pci_dev *pdev) int pcibios_add_platform_entries(struct pci_dev *pdev)
{ {
#ifdef CONFIG_PPC_OF
return device_create_file(&pdev->dev, &dev_attr_devspec); return device_create_file(&pdev->dev, &dev_attr_devspec);
#else
return 0;
#endif /* CONFIG_PPC_OF */
} }
char __devinit *pcibios_setup(char *str) char __devinit *pcibios_setup(char *str)
......
...@@ -34,9 +34,7 @@ int pcibios_assign_bus_offset = 1; ...@@ -34,9 +34,7 @@ int pcibios_assign_bus_offset = 1;
void pcibios_make_OF_bus_map(void); void pcibios_make_OF_bus_map(void);
static void fixup_cpc710_pci64(struct pci_dev* dev); static void fixup_cpc710_pci64(struct pci_dev* dev);
#ifdef CONFIG_PPC_OF
static u8* pci_to_OF_bus_map; static u8* pci_to_OF_bus_map;
#endif
/* By default, we don't re-assign bus numbers. We do this only on /* By default, we don't re-assign bus numbers. We do this only on
* some pmacs * some pmacs
...@@ -83,7 +81,6 @@ fixup_cpc710_pci64(struct pci_dev* dev) ...@@ -83,7 +81,6 @@ fixup_cpc710_pci64(struct pci_dev* dev)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64);
#ifdef CONFIG_PPC_OF
/* /*
* Functions below are used on OpenFirmware machines. * Functions below are used on OpenFirmware machines.
*/ */
...@@ -357,12 +354,6 @@ pci_create_OF_bus_map(void) ...@@ -357,12 +354,6 @@ pci_create_OF_bus_map(void)
} }
} }
#else /* CONFIG_PPC_OF */
void pcibios_make_OF_bus_map(void)
{
}
#endif /* CONFIG_PPC_OF */
static void __devinit pcibios_scan_phb(struct pci_controller *hose) static void __devinit pcibios_scan_phb(struct pci_controller *hose)
{ {
struct pci_bus *bus; struct pci_bus *bus;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment