powerpc/powernv: Remove PCI_MSI ifdef checks (5f639e5f) · Commits · e / devices / android_kernel_fairphone_FP5

arch/powerpc/platforms/powernv/pci-ioda.c

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -661,10 +661,6 @@ static int pnv_ioda_get_pe_state(struct pnv_phb *phb, int pe_no)
	return state;		return state;
	}		}

	/* Currently those 2 are only used when MSIs are enabled, this will change
	* but in the meantime, we need to protect them to avoid warnings
	*/
	#ifdef CONFIG_PCI_MSI
	struct pnv_ioda_pe pnv_ioda_get_pe(struct pci_dev dev)		struct pnv_ioda_pe pnv_ioda_get_pe(struct pci_dev dev)
	{		{
	struct pci_controller *hose = pci_bus_to_host(dev->bus);		struct pci_controller *hose = pci_bus_to_host(dev->bus);
	@@ -677,7 +673,6 @@ struct pnv_ioda_pe pnv_ioda_get_pe(struct pci_dev dev)
	return NULL;		return NULL;
	return &phb->ioda.pe_array[pdn->pe_number];		return &phb->ioda.pe_array[pdn->pe_number];
	}		}
	#endif /* CONFIG_PCI_MSI */

	static int pnv_ioda_set_one_peltv(struct pnv_phb *phb,		static int pnv_ioda_set_one_peltv(struct pnv_phb *phb,
	struct pnv_ioda_pe *parent,		struct pnv_ioda_pe *parent,
	@@ -2826,7 +2821,6 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
	pnv_ioda_setup_bus_dma(pe, pe->pbus, true);		pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
	}		}

	#ifdef CONFIG_PCI_MSI
	int64_t pnv_opal_pci_msi_eoi(struct irq_chip *chip, unsigned int hw_irq)		int64_t pnv_opal_pci_msi_eoi(struct irq_chip *chip, unsigned int hw_irq)
	{		{
	struct pnv_phb *phb = container_of(chip, struct pnv_phb,		struct pnv_phb *phb = container_of(chip, struct pnv_phb,
	@@ -2972,9 +2966,6 @@ static void pnv_pci_init_ioda_msis(struct pnv_phb *phb)
	pr_info(" Allocated bitmap for %d MSIs (base IRQ 0x%x)\n",		pr_info(" Allocated bitmap for %d MSIs (base IRQ 0x%x)\n",
	count, phb->msi_base);		count, phb->msi_base);
	}		}
	#else
	static void pnv_pci_init_ioda_msis(struct pnv_phb *phb) { }
	#endif /* CONFIG_PCI_MSI */

	#ifdef CONFIG_PCI_IOV		#ifdef CONFIG_PCI_IOV
	static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev)		static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev)
	@@ -3687,10 +3678,8 @@ static void pnv_pci_ioda_shutdown(struct pci_controller *hose)
	static const struct pci_controller_ops pnv_pci_ioda_controller_ops = {		static const struct pci_controller_ops pnv_pci_ioda_controller_ops = {
	.dma_dev_setup = pnv_pci_dma_dev_setup,		.dma_dev_setup = pnv_pci_dma_dev_setup,
	.dma_bus_setup = pnv_pci_dma_bus_setup,		.dma_bus_setup = pnv_pci_dma_bus_setup,
	#ifdef CONFIG_PCI_MSI
	.setup_msi_irqs = pnv_setup_msi_irqs,		.setup_msi_irqs = pnv_setup_msi_irqs,
	.teardown_msi_irqs = pnv_teardown_msi_irqs,		.teardown_msi_irqs = pnv_teardown_msi_irqs,
	#endif
	.enable_device_hook = pnv_pci_enable_device_hook,		.enable_device_hook = pnv_pci_enable_device_hook,
	.release_device = pnv_pci_release_device,		.release_device = pnv_pci_release_device,
	.window_alignment = pnv_pci_window_alignment,		.window_alignment = pnv_pci_window_alignment,
	@@ -3711,10 +3700,8 @@ static int pnv_npu_dma_set_mask(struct pci_dev *npdev, u64 dma_mask)

	static const struct pci_controller_ops pnv_npu_ioda_controller_ops = {		static const struct pci_controller_ops pnv_npu_ioda_controller_ops = {
	.dma_dev_setup = pnv_pci_dma_dev_setup,		.dma_dev_setup = pnv_pci_dma_dev_setup,
	#ifdef CONFIG_PCI_MSI
	.setup_msi_irqs = pnv_setup_msi_irqs,		.setup_msi_irqs = pnv_setup_msi_irqs,
	.teardown_msi_irqs = pnv_teardown_msi_irqs,		.teardown_msi_irqs = pnv_teardown_msi_irqs,
	#endif
	.enable_device_hook = pnv_pci_enable_device_hook,		.enable_device_hook = pnv_pci_enable_device_hook,
	.window_alignment = pnv_pci_window_alignment,		.window_alignment = pnv_pci_window_alignment,
	.reset_secondary_bus = pnv_pci_reset_secondary_bus,		.reset_secondary_bus = pnv_pci_reset_secondary_bus,

arch/powerpc/platforms/powernv/pci.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -160,7 +160,6 @@ int pnv_pci_set_power_state(uint64_t id, uint8_t state, struct opal_msg *msg)
	}		}
	EXPORT_SYMBOL_GPL(pnv_pci_set_power_state);		EXPORT_SYMBOL_GPL(pnv_pci_set_power_state);

	#ifdef CONFIG_PCI_MSI
	int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)		int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
	{		{
	struct pci_controller *hose = pci_bus_to_host(pdev->bus);		struct pci_controller *hose = pci_bus_to_host(pdev->bus);
	@@ -229,7 +228,6 @@ void pnv_teardown_msi_irqs(struct pci_dev *pdev)
	msi_bitmap_free_hwirqs(&phb->msi_bmp, hwirq - phb->msi_base, 1);		msi_bitmap_free_hwirqs(&phb->msi_bmp, hwirq - phb->msi_base, 1);
	}		}
	}		}
	#endif /* CONFIG_PCI_MSI */

	/* Nicely print the contents of the PE State Tables (PEST). */		/* Nicely print the contents of the PE State Tables (PEST). */
	static void pnv_pci_dump_pest(__be64 pestA[], __be64 pestB[], int pest_size)		static void pnv_pci_dump_pest(__be64 pestA[], __be64 pestB[], int pest_size)

arch/powerpc/platforms/powernv/pci.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -106,11 +106,9 @@ struct pnv_phb {
	struct dentry *dbgfs;		struct dentry *dbgfs;
	#endif		#endif

	#ifdef CONFIG_PCI_MSI
	unsigned int msi_base;		unsigned int msi_base;
	unsigned int msi32_support;		unsigned int msi32_support;
	struct msi_bitmap msi_bmp;		struct msi_bitmap msi_bmp;
	#endif
	int (msi_setup)(struct pnv_phb phb, struct pci_dev *dev,		int (msi_setup)(struct pnv_phb phb, struct pci_dev *dev,
	unsigned int hwirq, unsigned int virq,		unsigned int hwirq, unsigned int virq,
	unsigned int is_64, struct msi_msg *msg);		unsigned int is_64, struct msi_msg *msg);