powerpc/pseries: Remove use of CONFIG_PCI (84eb9e61) · Commits · 戴 / test

arch/powerpc/platforms/pseries/iommu.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -532,7 +532,6 @@ static int tce_setrange_multi_pSeriesLP_walk(unsigned long start_pfn,
	return tce_setrange_multi_pSeriesLP(start_pfn, num_pfn, arg);		return tce_setrange_multi_pSeriesLP(start_pfn, num_pfn, arg);
	}		}

	#ifdef CONFIG_PCI
	static void iommu_table_setparms(struct pci_controller *phb,		static void iommu_table_setparms(struct pci_controller *phb,
	struct device_node *dn,		struct device_node *dn,
	struct iommu_table *tbl)		struct iommu_table *tbl)
	@@ -1292,15 +1291,6 @@ static u64 dma_get_required_mask_pSeriesLP(struct device *dev)
	return dma_iommu_ops.get_required_mask(dev);		return dma_iommu_ops.get_required_mask(dev);
	}		}

	#else /* CONFIG_PCI */
	#define pci_dma_bus_setup_pSeries NULL
	#define pci_dma_dev_setup_pSeries NULL
	#define pci_dma_bus_setup_pSeriesLP NULL
	#define pci_dma_dev_setup_pSeriesLP NULL
	#define dma_set_mask_pSeriesLP NULL
	#define dma_get_required_mask_pSeriesLP NULL
	#endif /* !CONFIG_PCI */

	static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,		static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action,
	void *data)		void *data)
	{		{

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -837,10 +837,6 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus)
	return PCI_PROBE_NORMAL;		return PCI_PROBE_NORMAL;
	}		}

	#ifndef CONFIG_PCI
	void pSeries_final_fixup(void) { }
	#endif

	struct pci_controller_ops pseries_pci_controller_ops = {		struct pci_controller_ops pseries_pci_controller_ops = {
	.probe_mode = pSeries_pci_probe_mode,		.probe_mode = pSeries_pci_probe_mode,
	};		};