xen/events: refactor retrigger_dynirq() and resend_irq_on_evtchn()
authorDavid Vrabel <david.vrabel@citrix.com>
Tue, 12 Mar 2013 18:28:04 +0000 (18:28 +0000)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 6 Jan 2014 15:07:32 +0000 (10:07 -0500)
These two function did the same thing with different parameters, put
the common bits in retrigger_evtchn().

This changes the return value of resend_irq_on_evtchn() but the only
caller (in arch/ia64/xen/irq_xen.c) ignored the return value so this
is fine.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
drivers/xen/events.c

index 4035e833ea2643cb78ca5da68ed5db5037aee11d..ddcdbb508dab26ac57f952d95bc3d8945310937a 100644 (file)
@@ -1558,13 +1558,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));
@@ -1574,6 +1574,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);
@@ -1608,21 +1613,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)