irqchip/gic: Return IRQ_SET_MASK_OK_DONE in the set_affinity method

Moving an SPI around doesn't require any extra work from the rest
of the stack, and specially not for MSI-generated SPIs.

It is then worth returning IRQ_SET_MASK_OK_DONE instead of
IRQ_SET_MASK_OK, and simplify the other irqchips that rely on
this behaviour (GICv2m and Marvell's ODMI controller).

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1455894029-17270-1-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index c779f83e511d4f6c889a88aa38ffa8086228738e..28f047c61baae62ffed6a07c9ef2f55cbd4de05b 100644 (file)
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -92,18 +92,6 @@ static struct msi_domain_info gicv2m_msi_domain_info = {
        .chip   = &gicv2m_msi_irq_chip,
 };
 
-static int gicv2m_set_affinity(struct irq_data *irq_data,
-                              const struct cpumask *mask, bool force)
-{
-       int ret;
-
-       ret = irq_chip_set_affinity_parent(irq_data, mask, force);
-       if (ret == IRQ_SET_MASK_OK)
-               ret = IRQ_SET_MASK_OK_DONE;
-
-       return ret;
-}
-
 static void gicv2m_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
 {
        struct v2m_data *v2m = irq_data_get_irq_chip_data(data);
@@ -122,7 +110,7 @@ static struct irq_chip gicv2m_irq_chip = {
        .irq_mask               = irq_chip_mask_parent,
        .irq_unmask             = irq_chip_unmask_parent,
        .irq_eoi                = irq_chip_eoi_parent,
-       .irq_set_affinity       = gicv2m_set_affinity,
+       .irq_set_affinity       = irq_chip_set_affinity_parent,
        .irq_compose_msi_msg    = gicv2m_compose_msi_msg,
 };
 

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 911758c056c14152d5a248110c14f35bd48e9b78..e14f2f2a72632b0e2d8cb73053662877fc8f1a16 100644 (file)
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -319,7 +319,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
        writel_relaxed(val | bit, reg);
        raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
 
-       return IRQ_SET_MASK_OK;
+       return IRQ_SET_MASK_OK_DONE;
 }
 #endif
 

diff --git a/drivers/irqchip/irq-mvebu-odmi.c b/drivers/irqchip/irq-mvebu-odmi.c
index 0ae98b24836fd37cdb60fb8dc6b65550301d61c7..b4d367868dbbeffdd85a64614b291263e08f490d 100644 (file)
--- a/drivers/irqchip/irq-mvebu-odmi.c
+++ b/drivers/irqchip/irq-mvebu-odmi.c
@@ -47,18 +47,6 @@ static unsigned int odmis_count;
 /* Protects odmis_bm */
 static DEFINE_SPINLOCK(odmis_bm_lock);
 
-static int odmi_set_affinity(struct irq_data *d,
-                            const struct cpumask *mask, bool force)
-{
-       int ret;
-
-       ret = irq_chip_set_affinity_parent(d, mask, force);
-       if (ret == IRQ_SET_MASK_OK)
-               ret = IRQ_SET_MASK_OK_DONE;
-
-       return ret;
-}
-
 static void odmi_compose_msi_msg(struct irq_data *d, struct msi_msg *msg)
 {
        struct odmi_data *odmi;
@@ -83,7 +71,7 @@ static struct irq_chip odmi_irq_chip = {
        .irq_mask               = irq_chip_mask_parent,
        .irq_unmask             = irq_chip_unmask_parent,
        .irq_eoi                = irq_chip_eoi_parent,
-       .irq_set_affinity       = odmi_set_affinity,
+       .irq_set_affinity       = irq_chip_set_affinity_parent,
        .irq_compose_msi_msg    = odmi_compose_msi_msg,
 };