x86: remove unnecessary indirection from irq_complete_move()'s sole parameter

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

diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index a641856323e027e3571413500eba631681b200e3..9263dd2ee643a1bdf8ba915246988035e2ba8f23 100644 (file)
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -296,7 +296,7 @@ static void hpet_msi_ack(unsigned int irq)
 {
     struct irq_desc *desc = irq_to_desc(irq);
 
-    irq_complete_move(&desc);
+    irq_complete_move(desc);
     move_native_irq(irq);
     ack_APIC_irq();
 }

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index bccd52be8ea428e0bb74a9947dffe37b5c09486c..53b851b24cab2772ef62324b6b13a5fe765cf717 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -518,9 +518,8 @@ static void send_cleanup_vector(struct irq_cfg *cfg)
     cfg->move_in_progress = 0;
 }
 
-void irq_complete_move(struct irq_desc **descp)
+void irq_complete_move(struct irq_desc *desc)
 {
-    struct irq_desc *desc = *descp;
     struct irq_cfg *cfg = desc->chip_data;
     unsigned vector, me;
 
@@ -1569,7 +1568,7 @@ static void ack_edge_ioapic_irq(unsigned int irq)
 {
     struct irq_desc *desc = irq_to_desc(irq);
     
-    irq_complete_move(&desc);
+    irq_complete_move(desc);
     move_native_irq(irq);
 
     if ((desc->status & (IRQ_PENDING | IRQ_DISABLED))
@@ -1648,7 +1647,7 @@ static void mask_and_ack_level_ioapic_irq (unsigned int irq)
     int i;
     struct irq_desc *desc = irq_to_desc(irq);
 
-    irq_complete_move(&desc);
+    irq_complete_move(desc);
 
     if ( ioapic_ack_new )
         return;
@@ -1821,7 +1820,7 @@ static void ack_msi_irq(unsigned int irq)
 {
     struct irq_desc *desc = irq_to_desc(irq);
 
-    irq_complete_move(&desc);
+    irq_complete_move(desc);
     move_native_irq(irq);
 
     if ( msi_maskable_irq(desc->msi_desc) )

diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c
index 1a592329fa5cb9d9c12073f007a38af4b4333f9d..0b24a75e67f742c79e7807f2ee311e233b667088 100644 (file)
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -424,7 +424,7 @@ static void iommu_msi_mask(unsigned int irq)
     struct amd_iommu *iommu = irq_to_iommu[irq];
     struct irq_desc *desc = irq_to_desc(irq);
 
-    irq_complete_move(&desc);
+    irq_complete_move(desc);
 
     /* FIXME: do not support mask bits at the moment */
     if ( iommu->maskbit )

diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 73124e87235b80b40ff3a09a611eb7dbf3e7154d..b773e79acb4bb9097668d0326d86d34195f8ed2b 100644 (file)
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -978,7 +978,7 @@ static void dma_msi_mask(unsigned int irq)
     struct iommu *iommu = irq_to_iommu[irq];
     struct irq_desc *desc = irq_to_desc(irq);
 
-    irq_complete_move(&desc);
+    irq_complete_move(desc);
 
     /* mask it */
     spin_lock_irqsave(&iommu->register_lock, flags);

diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 8b6c106aab3dd7853b1faf7955614e8ffd596a2b..b6901edad4cd50153e26d3011084f54459bfe87d 100644 (file)
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -162,7 +162,7 @@ int create_irq(void);
 void destroy_irq(unsigned int irq);
 
 struct irq_desc;
-extern void irq_complete_move(struct irq_desc **descp);
+extern void irq_complete_move(struct irq_desc *);
 
 extern struct irq_desc *irq_desc;