[PATCH 0/2] PCI/MSI: Remove unused interfaces

[PATCH 0/2] PCI/MSI: Remove unused interfaces

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelgaas@google.com>

pcie-xilinx-nwl.c is the only driver to use mask_msi_irq() and
unmask_msi_irq(), which are trivial wrappers around PCI-specific functions.
We obviously know we need the PCI versions in this driver, so use them
directly, as all the other PCI host controller drivers do, and remove the
unused wrappers.

Unless there's objection, I'll merge both of these via my tree just to keep
them together.

Bjorn Helgaas (2):
  PCI/MSI: Remove unused __write_msi_msg() and write_msi_msg()
  PCI/MSI: Remove unused mask_msi_irq() and unmask_msi_irq()

 drivers/pci/controller/pcie-xilinx-nwl.c |  9 ++++-----
 include/linux/msi.h                      | 18 ------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

-- 
2.21.0.392.gf8f6787159e-goog

[PATCH 1/2] PCI/MSI: Remove unused __write_msi_msg() and write_msi_msg()

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelgaas@google.com>

Remove unused __write_msi_msg() and write_msi_msg().

These were added by 83a18912b0e8 ("PCI/MSI: Rename write_msi_msg() to
pci_write_msi_msg()"), they served their purpose, and they're no longer
needed.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Jiang Liu <jiang.liu@linux.intel.com>	# 83a18912b0e8 author
---
 include/linux/msi.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 7e9b81c3b50d..f934982a0e68 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -148,15 +148,6 @@ u32 __pci_msi_desc_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
 void pci_msi_mask_irq(struct irq_data *data);
 void pci_msi_unmask_irq(struct irq_data *data);
 
-/* Conversion helpers. Should be removed after merging */
-static inline void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
-{
-	__pci_write_msi_msg(entry, msg);
-}
-static inline void write_msi_msg(int irq, struct msi_msg *msg)
-{
-	pci_write_msi_msg(irq, msg);
-}
 static inline void mask_msi_irq(struct irq_data *data)
 {
 	pci_msi_mask_irq(data);
-- 
2.21.0.392.gf8f6787159e-goog

[PATCH 2/2] PCI/MSI: Remove unused mask_msi_irq() and unmask_msi_irq()

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelgaas@google.com>

Change pcie-xilinx-nwl.c to use pci_msi_mask_irq() and pci_msi_unmask_irq()
like all other PCI host controller drivers.  Remove the now-unused
mask_msi_irq() and unmask_msi_irq().

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Michal Simek <michal.simek@xilinx.com>
CC: linux-arm-kernel@lists.infradead.org
---
 drivers/pci/controller/pcie-xilinx-nwl.c | 9 ++++-----
 include/linux/msi.h                      | 9 ---------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
index 81538d77f790..3b031f00a94a 100644
--- a/drivers/pci/controller/pcie-xilinx-nwl.c
+++ b/drivers/pci/controller/pcie-xilinx-nwl.c
@@ -438,11 +438,10 @@ static const struct irq_domain_ops legacy_domain_ops = {
 #ifdef CONFIG_PCI_MSI
 static struct irq_chip nwl_msi_irq_chip = {
 	.name = "nwl_pcie:msi",
-	.irq_enable = unmask_msi_irq,
-	.irq_disable = mask_msi_irq,
-	.irq_mask = mask_msi_irq,
-	.irq_unmask = unmask_msi_irq,
-
+	.irq_enable = pci_msi_unmask_irq,
+	.irq_disable = pci_msi_mask_irq,
+	.irq_mask = pci_msi_mask_irq,
+	.irq_unmask = pci_msi_unmask_irq,
 };
 
 static struct msi_domain_info nwl_msi_domain_info = {
diff --git a/include/linux/msi.h b/include/linux/msi.h
index f934982a0e68..052f04fcf953 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -148,15 +148,6 @@ u32 __pci_msi_desc_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
 void pci_msi_mask_irq(struct irq_data *data);
 void pci_msi_unmask_irq(struct irq_data *data);
 
-static inline void mask_msi_irq(struct irq_data *data)
-{
-	pci_msi_mask_irq(data);
-}
-static inline void unmask_msi_irq(struct irq_data *data)
-{
-	pci_msi_unmask_irq(data);
-}
-
 /*
  * The arch hooks to setup up msi irqs. Those functions are
  * implemented as weak symbols so that they /can/ be overriden by
-- 
2.21.0.392.gf8f6787159e-goog

Re: [PATCH 0/2] PCI/MSI: Remove unused interfaces

[Bjorn Helgaas]

[+cc Lorenzo, Michal, linux-arm-kernel]

On Mon, Mar 25, 2019 at 05:12:27PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> 
> pcie-xilinx-nwl.c is the only driver to use mask_msi_irq() and
> unmask_msi_irq(), which are trivial wrappers around PCI-specific functions.
> We obviously know we need the PCI versions in this driver, so use them
> directly, as all the other PCI host controller drivers do, and remove the
> unused wrappers.
> 
> Unless there's objection, I'll merge both of these via my tree just to keep
> them together.

These are on pci/msi for v5.2.

> Bjorn Helgaas (2):
>   PCI/MSI: Remove unused __write_msi_msg() and write_msi_msg()
>   PCI/MSI: Remove unused mask_msi_irq() and unmask_msi_irq()
> 
>  drivers/pci/controller/pcie-xilinx-nwl.c |  9 ++++-----
>  include/linux/msi.h                      | 18 ------------------
>  2 files changed, 4 insertions(+), 23 deletions(-)
> 
> -- 
> 2.21.0.392.gf8f6787159e-goog
>