x86: drop unused parameter from msi_compose_msg() and setup_msi_irq()

This particularly eliminates the bogus passing of NULL by hpet.c.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

4 files changed, 7 insertions, 9 deletions

diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index f3a298fefc..dc92873311 100644
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -342,7 +342,7 @@ static void __hpet_setup_msi_irq(unsigned int irq)
 {
     struct msi_msg msg;
 
-    msi_compose_msg(NULL, irq, &msg);
+    msi_compose_msg(irq, &msg);
     hpet_msi_write(irq, &msg);
 }
 
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 22de938a5f..f08137dd33 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -1670,7 +1670,7 @@ int map_domain_pirq(
              && !desc->chip_data->used_vectors )
             desc->chip_data->used_vectors = &pdev->info.used_vectors;
         set_domain_irq_pirq(d, irq, info);
-        setup_msi_irq(pdev, msi_desc, irq);
+        setup_msi_irq(msi_desc, irq);
         spin_unlock_irqrestore(&desc->lock, flags);
     }
     else
diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index cec00ca4a9..74251e7df3 100644
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -120,8 +120,7 @@ static void msix_put_fixmap(struct pci_dev *dev, int idx)
 /*
  * MSI message composition
  */
-void msi_compose_msg(struct pci_dev *pdev, int irq,
-                            struct msi_msg *msg)
+void msi_compose_msg(int irq, struct msi_msg *msg)
 {
     unsigned dest;
     cpumask_t domain;
@@ -414,11 +413,11 @@ static struct msi_desc* alloc_msi_entry(void)
     return entry;
 }
 
-int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int irq)
+int setup_msi_irq(struct msi_desc *msidesc, int irq)
 {
     struct msi_msg msg;
 
-    msi_compose_msg(dev, irq, &msg);
+    msi_compose_msg(irq, &msg);
     set_irq_msi(msidesc);
     write_msi_msg(irq_desc[irq].msi_desc, &msg);
 
diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h
index f7290ee768..104a702f6b 100644
--- a/xen/include/asm-x86/msi.h
+++ b/xen/include/asm-x86/msi.h
@@ -81,7 +81,7 @@ extern void set_msi_affinity(unsigned int vector, cpumask_t mask);
 extern int pci_enable_msi(struct msi_info *msi, struct msi_desc **desc);
 extern void pci_disable_msi(struct msi_desc *desc);
 extern void pci_cleanup_msi(struct pci_dev *pdev);
-extern int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq);
+extern int setup_msi_irq(struct msi_desc *desc, int irq);
 extern void teardown_msi_irq(int irq);
 extern int msi_free_vector(struct msi_desc *entry);
 extern int pci_restore_msi_state(struct pci_dev *pdev);
@@ -221,6 +221,5 @@ struct msg_address {
 	__u32 	hi_address;
 } __attribute__ ((packed));
 
-void msi_compose_msg(struct pci_dev *pdev, int irq,
-                            struct msi_msg *msg);
+void msi_compose_msg(int irq, struct msi_msg *);
 #endif /* __ASM_MSI_H */