[Xen-changelog] [xen-unstable] IRQ: Remove bit-rotten code

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
# Date 1315231331 -3600
# Node ID fe44efb1f592c8cbbe924a5aa4858c34ab3f9963
# Parent  5535d7ce2673e54cbd19685f9ed875d42f6f3a5f
IRQ: Remove bit-rotten code

irq_desc.depth is a write only variable.
LEGACY_IRQ_FROM_VECTOR(vec) is never referenced.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
---


diff -r 5535d7ce2673 -r fe44efb1f592 xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c    Mon Sep 05 15:00:46 2011 +0100
+++ b/xen/arch/x86/io_apic.c    Mon Sep 05 15:02:11 2011 +0100
@@ -1967,7 +1967,6 @@
     if ((ret = bind_irq_vector(0, vector, mask_all)))
         printk(KERN_ERR"..IRQ0 is not set correctly with ioapic!!!, err:%d\n", 
ret);
     
-    irq_desc[0].depth  = 0;
     irq_desc[0].status &= ~IRQ_DISABLED;
 
     /*
diff -r 5535d7ce2673 -r fe44efb1f592 xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Mon Sep 05 15:00:46 2011 +0100
+++ b/xen/arch/x86/irq.c        Mon Sep 05 15:02:11 2011 +0100
@@ -202,7 +202,6 @@
     desc->handler->shutdown(irq);
     action = desc->action;
     desc->action  = NULL;
-    desc->depth   = 1;
     desc->msi_desc = NULL;
     desc->handler = &no_irq_type;
     desc->chip_data->used_vectors=NULL;
@@ -302,7 +301,6 @@
     desc->status  = IRQ_DISABLED;
     desc->handler = &no_irq_type;
     desc->action  = NULL;
-    desc->depth   = 1;
     desc->msi_desc = NULL;
     spin_lock_init(&desc->lock);
     cpus_setall(desc->affinity);
@@ -817,7 +815,6 @@
     spin_lock_irqsave(&desc->lock,flags);
     action = desc->action;
     desc->action  = NULL;
-    desc->depth   = 1;
     desc->status |= IRQ_DISABLED;
     desc->handler->shutdown(irq);
     spin_unlock_irqrestore(&desc->lock,flags);
@@ -845,7 +842,6 @@
     }
 
     desc->action  = new;
-    desc->depth   = 0;
     desc->status &= ~IRQ_DISABLED;
     desc->handler->startup(irq);
 
@@ -1424,7 +1420,6 @@
         cpus_clear(action->cpu_eoi_map);
         init_timer(&action->eoi_timer, irq_guest_eoi_timer_fn, desc, 0);
 
-        desc->depth = 0;
         desc->status |= IRQ_GUEST;
         desc->status &= ~IRQ_DISABLED;
         desc->handler->startup(irq);
@@ -1540,7 +1535,6 @@
     BUG_ON(action->in_flight != 0);
 
     /* Disabling IRQ before releasing the desc_lock avoids an IRQ storm. */
-    desc->depth   = 1;
     desc->status |= IRQ_DISABLED;
     desc->handler->disable(irq);
 
diff -r 5535d7ce2673 -r fe44efb1f592 xen/include/asm-x86/irq.h
--- a/xen/include/asm-x86/irq.h Mon Sep 05 15:00:46 2011 +0100
+++ b/xen/include/asm-x86/irq.h Mon Sep 05 15:02:11 2011 +0100
@@ -19,7 +19,6 @@
 #define MSI_IRQ(irq)       ((irq) >= nr_irqs_gsi && (irq) < nr_irqs)
 
 #define LEGACY_VECTOR(irq)          ((irq) + FIRST_LEGACY_VECTOR)
-#define LEGACY_IRQ_FROM_VECTOR(vec) ((vec) - FIRST_LEGACY_VECTOR)
 
 #define irq_to_desc(irq)    (&irq_desc[irq])
 #define irq_cfg(irq)        (&irq_cfg[irq])
diff -r 5535d7ce2673 -r fe44efb1f592 xen/include/xen/irq.h
--- a/xen/include/xen/irq.h     Mon Sep 05 15:00:46 2011 +0100
+++ b/xen/include/xen/irq.h     Mon Sep 05 15:02:11 2011 +0100
@@ -72,7 +72,6 @@
     hw_irq_controller *handler;
     struct msi_desc   *msi_desc;
     struct irqaction *action;  /* IRQ action list */
-    unsigned int depth;                /* nested irq disables */
     struct irq_cfg *chip_data;
     int irq;
     spinlock_t lock;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog