powerpc/pci: Remove dead checks for CONFIG_PPC_OF (ae14e13a) · Commits · 戴 / test

arch/powerpc/kernel/pci-common.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -176,8 +176,6 @@ int pci_domain_nr(struct pci_bus *bus)
		}
		EXPORT_SYMBOL(pci_domain_nr);

		#ifdef CONFIG_PPC_OF

		/* This routine is meant to be used early during boot, when the
		* PCI bus numbers have not yet been assigned, and you need to
		* issue PCI config cycles to an OF device.
		@@ -210,17 +208,11 @@ static ssize_t pci_show_devspec(struct device *dev,
		return sprintf(buf, "%s", np->full_name);
		}
		static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);
		#endif /* CONFIG_PPC_OF */

		/* Add sysfs properties */
		int pcibios_add_platform_entries(struct pci_dev *pdev)
		{
		#ifdef CONFIG_PPC_OF
		return device_create_file(&pdev->dev, &dev_attr_devspec);
		#else
		return 0;
		#endif /* CONFIG_PPC_OF */

		}

		char __devinit pcibios_setup(char str)

+0 −9

Original line number	Diff line number	Diff line
		@@ -34,9 +34,7 @@ int pcibios_assign_bus_offset = 1;
		void pcibios_make_OF_bus_map(void);

		static void fixup_cpc710_pci64(struct pci_dev* dev);
		#ifdef CONFIG_PPC_OF
		static u8* pci_to_OF_bus_map;
		#endif

		/* By default, we don't re-assign bus numbers. We do this only on
		* some pmacs
		@@ -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);

		#ifdef CONFIG_PPC_OF
		/*
		* Functions below are used on OpenFirmware machines.
		*/
		@@ -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)
		{
		struct pci_bus *bus;