gpio: 104-dio-48e: Implement struct dio48e_gpio

A private data structure struct dio48e_gpio is introduced to facilitate
passage of the regmap and IRQ mask state for the device to the callback
dio48e_handle_mask_sync(). This is in preparation for the removal of the
handle_mask_sync() map parameter in a subsequent patch.

Signed-off-by: William Breathitt Gray <william.gray@linaro.org
Reviewed-by: Linus Walleij <linus.walleij@linaro.org
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com
Link: https://lore.kernel.org/r/ca710d14a710fee44f7911f2a84b6a55570561ee.1679323449.git.william.gray@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org

diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
index f2253fd5ab4bbf0ad1fbffb44b0802d2330df24a..63dce9532e9758724873af8ad22bc1d8953c4219 100644 (file)
--- a/drivers/gpio/gpio-104-dio-48e.c
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -100,13 +100,23 @@ static const struct regmap_irq dio48e_regmap_irqs[] = {
        DIO48E_REGMAP_IRQ(0), DIO48E_REGMAP_IRQ(1),
 };
 
+/**
+ * struct dio48e_gpio - GPIO device private data structure
+ * @map:       Regmap for the device
+ * @irq_mask:  Current IRQ mask state on the device
+ */
+struct dio48e_gpio {
+       struct regmap *map;
+       unsigned int irq_mask;
+};
+
 static int dio48e_handle_mask_sync(struct regmap *const map, const int index,
                                   const unsigned int mask_buf_def,
                                   const unsigned int mask_buf,
                                   void *const irq_drv_data)
 {
-       unsigned int *const irq_mask = irq_drv_data;
-       const unsigned int prev_mask = *irq_mask;
+       struct dio48e_gpio *const dio48egpio = irq_drv_data;
+       const unsigned int prev_mask = dio48egpio->irq_mask;
        int err;
        unsigned int val;
 
@@ -115,19 +125,19 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index,
                return 0;
 
        /* remember the current mask for the next mask sync */
-       *irq_mask = mask_buf;
+       dio48egpio->irq_mask = mask_buf;
 
        /* if all previously masked, enable interrupts when unmasking */
        if (prev_mask == mask_buf_def) {
-               err = regmap_write(map, DIO48E_CLEAR_INTERRUPT, 0x00);
+               err = regmap_write(dio48egpio->map, DIO48E_CLEAR_INTERRUPT, 0x00);
                if (err)
                        return err;
-               return regmap_write(map, DIO48E_ENABLE_INTERRUPT, 0x00);
+               return regmap_write(dio48egpio->map, DIO48E_ENABLE_INTERRUPT, 0x00);
        }
 
        /* if all are currently masked, disable interrupts */
        if (mask_buf == mask_buf_def)
-               return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val);
+               return regmap_read(dio48egpio->map, DIO48E_DISABLE_INTERRUPT, &val);
 
        return 0;
 }
@@ -168,7 +178,7 @@ static int dio48e_probe(struct device *dev, unsigned int id)
        struct regmap *map;
        int err;
        struct regmap_irq_chip *chip;
-       unsigned int irq_mask;
+       struct dio48e_gpio *dio48egpio;
        struct regmap_irq_chip_data *chip_data;
 
        if (!devm_request_region(dev, base[id], DIO48E_EXTENT, name)) {
@@ -186,12 +196,14 @@ static int dio48e_probe(struct device *dev, unsigned int id)
                return dev_err_probe(dev, PTR_ERR(map),
                                     "Unable to initialize register map\n");
 
-       chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
-       if (!chip)
+       dio48egpio = devm_kzalloc(dev, sizeof(*dio48egpio), GFP_KERNEL);
+       if (!dio48egpio)
                return -ENOMEM;
 
-       chip->irq_drv_data = devm_kzalloc(dev, sizeof(irq_mask), GFP_KERNEL);
-       if (!chip->irq_drv_data)
+       dio48egpio->map = map;
+
+       chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
+       if (!chip)
                return -ENOMEM;
 
        chip->name = name;
@@ -202,6 +214,7 @@ static int dio48e_probe(struct device *dev, unsigned int id)
        chip->irqs = dio48e_regmap_irqs;
        chip->num_irqs = ARRAY_SIZE(dio48e_regmap_irqs);
        chip->handle_mask_sync = dio48e_handle_mask_sync;
+       chip->irq_drv_data = dio48egpio;
 
        /* Initialize to prevent spurious interrupts before we're ready */
        err = dio48e_irq_init_hw(map);