[PATCH 04/11][jammy/linux-azure] PCI/MSI: Make pci_msi_domain_write_msg() static
Tim Gardner
tim.gardner at canonical.com
Wed Jul 13 12:56:42 UTC 2022
From: Thomas Gleixner <tglx at linutronix.de>
BugLink: https://bugs.launchpad.net/bugs/1981577
There is no point to have this function public as it is set by the PCI core
anyway when a PCI/MSI irqdomain is created.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Tested-by: Juergen Gross <jgross at suse.com>
Reviewed-by: Jason Gunthorpe <jgg at nvidia.com>
Acked-by: Bjorn Helgaas <bhelgaas at google.com> # PCI
Link: https://lore.kernel.org/r/20211206210224.157070464@linutronix.de
(cherry picked from commit 9e8688c5f2990dadcf83728cd00a7e8497fc6aa9)
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
drivers/irqchip/irq-gic-v2m.c | 1 -
drivers/irqchip/irq-gic-v3-its-pci-msi.c | 1 -
drivers/irqchip/irq-gic-v3-mbi.c | 1 -
drivers/pci/msi.c | 2 +-
include/linux/msi.h | 1 -
5 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index 9349fc68b81a..62cc78e0da78 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -88,7 +88,6 @@ static struct irq_chip gicv2m_msi_irq_chip = {
.irq_mask = gicv2m_mask_msi_irq,
.irq_unmask = gicv2m_unmask_msi_irq,
.irq_eoi = irq_chip_eoi_parent,
- .irq_write_msi_msg = pci_msi_domain_write_msg,
};
static struct msi_domain_info gicv2m_msi_domain_info = {
diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
index ad2810c017ed..93f77a8196da 100644
--- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c
+++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c
@@ -28,7 +28,6 @@ static struct irq_chip its_msi_irq_chip = {
.irq_unmask = its_unmask_msi_irq,
.irq_mask = its_mask_msi_irq,
.irq_eoi = irq_chip_eoi_parent,
- .irq_write_msi_msg = pci_msi_domain_write_msg,
};
static int its_pci_msi_vec_count(struct pci_dev *pdev, void *data)
diff --git a/drivers/irqchip/irq-gic-v3-mbi.c b/drivers/irqchip/irq-gic-v3-mbi.c
index b84c9c2eccdc..a2163d32f17d 100644
--- a/drivers/irqchip/irq-gic-v3-mbi.c
+++ b/drivers/irqchip/irq-gic-v3-mbi.c
@@ -171,7 +171,6 @@ static struct irq_chip mbi_msi_irq_chip = {
.irq_unmask = mbi_unmask_msi_irq,
.irq_eoi = irq_chip_eoi_parent,
.irq_compose_msi_msg = mbi_compose_msi_msg,
- .irq_write_msi_msg = pci_msi_domain_write_msg,
};
static struct msi_domain_info mbi_msi_domain_info = {
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 96132d68be1e..c9a7877285f5 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1280,7 +1280,7 @@ EXPORT_SYMBOL_GPL(msi_desc_to_pci_sysdata);
* @irq_data: Pointer to interrupt data of the MSI interrupt
* @msg: Pointer to the message
*/
-void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg)
+static void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg)
{
struct msi_desc *desc = irq_data_get_msi_desc(irq_data);
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 5c627750f269..d7b143a79cb4 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -455,7 +455,6 @@ void *platform_msi_get_host_data(struct irq_domain *domain);
#endif /* CONFIG_GENERIC_MSI_IRQ_DOMAIN */
#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN
-void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg);
struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,
struct msi_domain_info *info,
struct irq_domain *parent);
--
2.37.0
More information about the kernel-team
mailing list