1 files changed, 63 insertions, 44 deletions

diff --git a/drivers/gpio/sx150x.c b/drivers/gpio/sx150x.c
index 823559ab0e24..a4f73534394e 100644
--- a/drivers/gpio/sx150x.c
+++ b/drivers/gpio/sx150x.c
@@ -25,6 +25,8 @@
 #include <linux/workqueue.h>
 #include <linux/i2c/sx150x.h>
 
+#define NO_UPDATE_PENDING       -1
+
 struct sx150x_device_data {
         u8 reg_pullup;
         u8 reg_pulldn;
@@ -47,8 +49,11 @@ struct sx150x_chip {
         const struct sx150x_device_data *dev_cfg;
         int                              irq_summary;
         int                              irq_base;
+        int                              irq_update;
         u32                              irq_sense;
-        unsigned long                    irq_set_type_pending;
+        u32                              irq_masked;
+        u32                              dev_sense;
+        u32                              dev_masked;
         struct irq_chip                  irq_chip;
         struct mutex                     lock;
 };
@@ -304,36 +309,34 @@ static int sx150x_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
         return chip->irq_base + offset;
 }
 
-static void sx150x_irq_mask(unsigned int irq)
+static void sx150x_irq_mask(struct irq_data *d)
 {
-        struct irq_chip *ic = get_irq_chip(irq);
+        struct irq_chip *ic = irq_data_get_irq_chip(d);
         struct sx150x_chip *chip;
         unsigned n;
 
         chip = container_of(ic, struct sx150x_chip, irq_chip);
-        n = irq - chip->irq_base;
-
-        sx150x_write_cfg(chip, n, 1, chip->dev_cfg->reg_irq_mask, 1);
-        sx150x_write_cfg(chip, n, 2, chip->dev_cfg->reg_sense, 0);
+        n = d->irq - chip->irq_base;
+        chip->irq_masked |= (1 << n);
+        chip->irq_update = n;
 }
 
-static void sx150x_irq_unmask(unsigned int irq)
+static void sx150x_irq_unmask(struct irq_data *d)
 {
-        struct irq_chip *ic = get_irq_chip(irq);
+        struct irq_chip *ic = irq_data_get_irq_chip(d);
         struct sx150x_chip *chip;
         unsigned n;
 
         chip = container_of(ic, struct sx150x_chip, irq_chip);
-        n = irq - chip->irq_base;
+        n = d->irq - chip->irq_base;
 
-        sx150x_write_cfg(chip, n, 1, chip->dev_cfg->reg_irq_mask, 0);
-        sx150x_write_cfg(chip, n, 2, chip->dev_cfg->reg_sense,
-                         chip->irq_sense >> (n * 2));
+        chip->irq_masked &= ~(1 << n);
+        chip->irq_update = n;
 }
 
-static int sx150x_irq_set_type(unsigned int irq, unsigned int flow_type)
+static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type)
 {
-        struct irq_chip *ic = get_irq_chip(irq);
+        struct irq_chip *ic = irq_data_get_irq_chip(d);
         struct sx150x_chip *chip;
         unsigned n, val = 0;
 
@@ -341,7 +344,7 @@ static int sx150x_irq_set_type(unsigned int irq, unsigned int flow_type)
                 return -EINVAL;
 
         chip = container_of(ic, struct sx150x_chip, irq_chip);
-        n = irq - chip->irq_base;
+        n = d->irq - chip->irq_base;
 
         if (flow_type & IRQ_TYPE_EDGE_RISING)
                 val |= 0x1;
@@ -350,7 +353,7 @@ static int sx150x_irq_set_type(unsigned int irq, unsigned int flow_type)
 
         chip->irq_sense &= ~(3UL << (n * 2));
         chip->irq_sense |= val << (n * 2);
-        chip->irq_set_type_pending |= BIT(n);
+        chip->irq_update = n;
         return 0;
 }
 
@@ -386,9 +389,9 @@ static irqreturn_t sx150x_irq_thread_fn(int irq, void *dev_id)
         return (nhandled > 0 ? IRQ_HANDLED : IRQ_NONE);
 }
 
-static void sx150x_irq_bus_lock(unsigned int irq)
+static void sx150x_irq_bus_lock(struct irq_data *d)
 {
-        struct irq_chip *ic = get_irq_chip(irq);
+        struct irq_chip *ic = irq_data_get_irq_chip(d);
         struct sx150x_chip *chip;
 
         chip = container_of(ic, struct sx150x_chip, irq_chip);
@@ -396,23 +399,37 @@ static void sx150x_irq_bus_lock(unsigned int irq)
         mutex_lock(&chip->lock);
 }
 
-static void sx150x_irq_bus_sync_unlock(unsigned int irq)
+static void sx150x_irq_bus_sync_unlock(struct irq_data *d)
 {
-        struct irq_chip *ic = get_irq_chip(irq);
+        struct irq_chip *ic = irq_data_get_irq_chip(d);
         struct sx150x_chip *chip;
         unsigned n;
 
         chip = container_of(ic, struct sx150x_chip, irq_chip);
 
-        while (chip->irq_set_type_pending) {
-                n = __ffs(chip->irq_set_type_pending);
-                chip->irq_set_type_pending &= ~BIT(n);
-                if (!(irq_to_desc(n + chip->irq_base)->status & IRQ_MASKED))
-                        sx150x_write_cfg(chip, n, 2,
-                                        chip->dev_cfg->reg_sense,
-                                        chip->irq_sense >> (n * 2));
-        }
+        if (chip->irq_update == NO_UPDATE_PENDING)
+                goto out;
+
+        n = chip->irq_update;
+        chip->irq_update = NO_UPDATE_PENDING;
 
+        /* Avoid updates if nothing changed */
+        if (chip->dev_sense == chip->irq_sense &&
+            chip->dev_sense == chip->irq_masked)
+                goto out;
+
+        chip->dev_sense = chip->irq_sense;
+        chip->dev_masked = chip->irq_masked;
+
+        if (chip->irq_masked & (1 << n)) {
+                sx150x_write_cfg(chip, n, 1, chip->dev_cfg->reg_irq_mask, 1);
+                sx150x_write_cfg(chip, n, 2, chip->dev_cfg->reg_sense, 0);
+        } else {
+                sx150x_write_cfg(chip, n, 1, chip->dev_cfg->reg_irq_mask, 0);
+                sx150x_write_cfg(chip, n, 2, chip->dev_cfg->reg_sense,
+                                 chip->irq_sense >> (n * 2));
+        }
+out:
         mutex_unlock(&chip->lock);
 }
 
@@ -437,16 +454,19 @@ static void sx150x_init_chip(struct sx150x_chip *chip,
         if (pdata->oscio_is_gpo)
                 ++chip->gpio_chip.ngpio;
 
-        chip->irq_chip.name            = client->name;
-        chip->irq_chip.mask            = sx150x_irq_mask;
-        chip->irq_chip.unmask          = sx150x_irq_unmask;
-        chip->irq_chip.set_type        = sx150x_irq_set_type;
-        chip->irq_chip.bus_lock        = sx150x_irq_bus_lock;
-        chip->irq_chip.bus_sync_unlock = sx150x_irq_bus_sync_unlock;
-        chip->irq_summary              = -1;
-        chip->irq_base                 = -1;
-        chip->irq_sense                = 0;
-        chip->irq_set_type_pending     = 0;
+        chip->irq_chip.name                = client->name;
+        chip->irq_chip.irq_mask            = sx150x_irq_mask;
+        chip->irq_chip.irq_unmask          = sx150x_irq_unmask;
+        chip->irq_chip.irq_set_type        = sx150x_irq_set_type;
+        chip->irq_chip.irq_bus_lock        = sx150x_irq_bus_lock;
+        chip->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock;
+        chip->irq_summary                  = -1;
+        chip->irq_base                     = -1;
+        chip->irq_masked                   = ~0;
+        chip->irq_sense                    = 0;
+        chip->dev_masked                   = ~0;
+        chip->dev_sense                    = 0;
+        chip->irq_update                   = NO_UPDATE_PENDING;
 }
 
 static int sx150x_init_io(struct sx150x_chip *chip, u8 base, u16 cfg)
@@ -531,12 +551,12 @@ static int sx150x_install_irq_chip(struct sx150x_chip *chip,
 
         for (n = 0; n < chip->dev_cfg->ngpios; ++n) {
                 irq = irq_base + n;
-                set_irq_chip_and_handler(irq, &chip->irq_chip, handle_edge_irq);
-                set_irq_nested_thread(irq, 1);
+                irq_set_chip_and_handler(irq, &chip->irq_chip, handle_edge_irq);
+                irq_set_nested_thread(irq, 1);
 #ifdef CONFIG_ARM
                 set_irq_flags(irq, IRQF_VALID);
 #else
-                set_irq_noprobe(irq);
+                irq_set_noprobe(irq);
 #endif
         }
 
@@ -563,8 +583,7 @@ static void sx150x_remove_irq_chip(struct sx150x_chip *chip)
 
         for (n = 0; n < chip->dev_cfg->ngpios; ++n) {
                 irq = chip->irq_base + n;
-                set_irq_handler(irq, NULL);
-                set_irq_chip(irq, NULL);
+                irq_set_chip_and_handler(irq, NULL, NULL);
         }
 }