[Xen-devel] [PATCH 01/12] xen/events: refactor retrigger_dynirq() and resend_irq_on_evtchn()

[David Vrabel <david.vrabel@xxxxxxxxxx>]

From: David Vrabel <david.vrabel@xxxxxxxxxx>

These two function did the same thing with different parameters, put
the common bits in retrigger_evtchn().

Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>
---
 drivers/xen/events.c |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index a58ac43..1697cf2 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -1529,13 +1529,13 @@ static int set_affinity_irq(struct irq_data *data, 
const struct cpumask *dest,
        return rebind_irq_to_cpu(data->irq, tcpu);
 }
 
-int resend_irq_on_evtchn(unsigned int irq)
+static int retrigger_evtchn(int evtchn)
 {
-       int masked, evtchn = evtchn_from_irq(irq);
+       int masked;
        struct shared_info *s = HYPERVISOR_shared_info;
 
        if (!VALID_EVTCHN(evtchn))
-               return 1;
+               return 0;
 
        masked = sync_test_and_set_bit(evtchn, BM(s->evtchn_mask));
        sync_set_bit(evtchn, BM(s->evtchn_pending));
@@ -1545,6 +1545,11 @@ int resend_irq_on_evtchn(unsigned int irq)
        return 1;
 }
 
+int resend_irq_on_evtchn(unsigned int irq)
+{
+       return retrigger_evtchn(evtchn_from_irq(irq));
+}
+
 static void enable_dynirq(struct irq_data *data)
 {
        int evtchn = evtchn_from_irq(data->irq);
@@ -1579,21 +1584,7 @@ static void mask_ack_dynirq(struct irq_data *data)
 
 static int retrigger_dynirq(struct irq_data *data)
 {
-       int evtchn = evtchn_from_irq(data->irq);
-       struct shared_info *sh = HYPERVISOR_shared_info;
-       int ret = 0;
-
-       if (VALID_EVTCHN(evtchn)) {
-               int masked;
-
-               masked = sync_test_and_set_bit(evtchn, BM(sh->evtchn_mask));
-               sync_set_bit(evtchn, BM(sh->evtchn_pending));
-               if (!masked)
-                       unmask_evtchn(evtchn);
-               ret = 1;
-       }
-
-       return ret;
+       return retrigger_evtchn(evtchn_from_irq(data->irq));
 }
 
 static void restore_pirqs(void)
-- 
1.7.2.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel