[Xen-changelog] [xen-unstable] IRQ: move a few more bits into common code

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1320679706 -3600
# Node ID 4e13729a0adf61f31dcb4e2614a7bc9cac56605c
# Parent  b0e140037c597be54a5f28a9f776844bf25f8a8b
IRQ: move a few more bits into common code

... as they're not really arch-specific.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
---


diff -r b0e140037c59 -r 4e13729a0adf xen/arch/ia64/xen/irq.c
--- a/xen/arch/ia64/xen/irq.c   Mon Nov 07 14:37:51 2011 +0000
+++ b/xen/arch/ia64/xen/irq.c   Mon Nov 07 16:28:26 2011 +0100
@@ -105,15 +105,6 @@
  * Special irq handlers.
  */
 
-void no_action(int cpl, void *dev_id, struct pt_regs *regs) { }
-
-/*
- * Generic no controller code
- */
-
-static void enable_none(unsigned int irq) { }
-static unsigned int startup_none(unsigned int irq) { return 0; }
-static void disable_none(unsigned int irq) { }
 static void ack_none(unsigned int irq)
 {
 /*
@@ -124,18 +115,14 @@
        printk(KERN_ERR "Unexpected irq vector 0x%x on CPU %u!\n", irq, 
smp_processor_id());
 }
 
-/* startup is the same as "enable", shutdown is same as "disable" */
-#define shutdown_none  disable_none
-#define end_none       enable_none
-
 hw_irq_controller no_irq_type = {
-       "none",
-       startup_none,
-       shutdown_none,
-       enable_none,
-       disable_none,
-       ack_none,
-       end_none
+       .typename = "none",
+       .startup = irq_startup_none,
+       .shutdown = irq_shutdown_none,
+       .enable = irq_enable_none,
+       .disable = irq_disable_none,
+       .ack = ack_none,
+       .end = irq_actor_none
 };
 
 /*
diff -r b0e140037c59 -r 4e13729a0adf xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Mon Nov 07 14:37:51 2011 +0000
+++ b/xen/arch/x86/irq.c        Mon Nov 07 16:28:26 2011 +0100
@@ -358,10 +358,6 @@
 
 static void __do_IRQ_guest(int vector);
 
-void no_action(int cpl, void *dev_id, struct cpu_user_regs *regs) { }
-
-void irq_actor_none(struct irq_desc *desc) { }
-unsigned int irq_startup_none(struct irq_desc *desc) { return 0; }
 static void ack_none(struct irq_desc *desc)
 {
     ack_bad_irq(desc->irq);
diff -r b0e140037c59 -r 4e13729a0adf xen/common/irq.c
--- a/xen/common/irq.c  Mon Nov 07 14:37:51 2011 +0000
+++ b/xen/common/irq.c  Mon Nov 07 16:28:26 2011 +0100
@@ -26,3 +26,16 @@
 
     return err;
 }
+
+void no_action(int cpl, void *dev_id, struct cpu_user_regs *regs)
+{
+}
+
+void irq_actor_none(struct irq_desc *desc)
+{
+}
+
+unsigned int irq_startup_none(struct irq_desc *desc)
+{
+    return 0;
+}

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