Merge "msm: pcie: update PCIe RC and MSI driver to compile as GKI modules" (5f6b0786) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/pci/controller/pci-msm-msi.c

+5 −2

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.*/
		/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.*/

		#include <linux/interrupt.h>
		#include <linux/iommu.h>
		@@ -321,6 +321,7 @@ int msm_msi_init(struct device *dev)
		struct msm_msi *msi;
		struct device_node *of_node;
		const __be32 *prop_val;
		struct of_phandle_args irq;

		if (!dev->of_node) {
		dev_err(dev, "MSI: missing DT node\n");
		@@ -369,7 +370,9 @@ int msm_msi_init(struct device *dev)
		goto err;
		}

		msi->nr_irqs = of_irq_count(msi->of_node);
		while (of_irq_parse_one(msi->of_node, msi->nr_irqs, &irq) == 0)
		msi->nr_irqs++;

		if (!msi->nr_irqs) {
		dev_err(msi->dev, "MSI: found no MSI interrupts\n");
		ret = -ENODEV;

+3 −0

Original line number	Diff line number	Diff line
		@@ -7278,3 +7278,6 @@ int msm_pcie_shadow_control(struct pci_dev *dev, bool enable)
		return ret;
		}
		EXPORT_SYMBOL(msm_pcie_shadow_control);

		MODULE_DESCRIPTION("Qualcomm Technologies, Inc. PCIe RC driver");
		MODULE_LICENSE("GPL v2");