staging: mt7621-gpio: avoid use of globals and use platform_data instead

Gpio driver have a some globals which can be avoided just
using platform_data in a proper form. This commit adds a new
struct mtk_data which includes all of those globals setting them
using platform_set_drvdata and devm_gpiochip_add_data functions.
With this properly set we are able to retrieve driver data along
the code using kernel api's so globals are not needed anymore.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/mt7621-gpio/gpio-mt7621.c b/drivers/staging/mt7621-gpio/gpio-mt7621.c
index 7d179492d8af2ad49f950f4f8ffb5e3b19c18ede..077a7c24df5b43ed37cac27df1e1071d881d405e 100644 (file)
--- a/drivers/staging/mt7621-gpio/gpio-mt7621.c
+++ b/drivers/staging/mt7621-gpio/gpio-mt7621.c
@@ -31,17 +31,20 @@ enum mediatek_gpio_reg {
        GPIO_REG_EDGE,
 };
 
-static void __iomem *mediatek_gpio_membase;
-static int mediatek_gpio_irq;
-static struct irq_domain *mediatek_gpio_irq_domain;
-
-static struct mtk_gc {
+struct mtk_gc {
        struct gpio_chip chip;
        spinlock_t lock;
        int bank;
        u32 rising;
        u32 falling;
-} *gc_map[MTK_MAX_BANK];
+};
+
+struct mtk_data {
+       void __iomem *gpio_membase;
+       int gpio_irq;
+       struct irq_domain *gpio_irq_domain;
+       struct mtk_gc *gc_map[MTK_MAX_BANK];
+};
 
 static inline struct mtk_gc
 *to_mediatek_gpio(struct gpio_chip *chip)
@@ -56,15 +59,19 @@ static inline struct mtk_gc
 static inline void
 mtk_gpio_w32(struct mtk_gc *rg, u8 reg, u32 val)
 {
-       iowrite32(val, mediatek_gpio_membase + (reg * 0x10) + (rg->bank * 0x4));
+       struct mtk_data *gpio_data = gpiochip_get_data(&rg->chip);
+       u32 offset = (reg * 0x10) + (rg->bank * 0x4);
+
+       iowrite32(val, gpio_data->gpio_membase + offset);
 }
 
 static inline u32
 mtk_gpio_r32(struct mtk_gc *rg, u8 reg)
 {
+       struct mtk_data *gpio_data = gpiochip_get_data(&rg->chip);
        u32 offset = (reg * 0x10) + (rg->bank * 0x4);
 
-       return ioread32(mediatek_gpio_membase + offset);
+       return ioread32(gpio_data->gpio_membase + offset);
 }
 
 static void
@@ -137,23 +144,26 @@ mediatek_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
 static int
 mediatek_gpio_to_irq(struct gpio_chip *chip, unsigned int pin)
 {
+       struct mtk_data *gpio_data = gpiochip_get_data(chip);
        struct mtk_gc *rg = to_mediatek_gpio(chip);
 
-       return irq_create_mapping(mediatek_gpio_irq_domain,
+       return irq_create_mapping(gpio_data->gpio_irq_domain,
                                  pin + (rg->bank * MTK_BANK_WIDTH));
 }
 
 static int
 mediatek_gpio_bank_probe(struct platform_device *pdev, struct device_node *bank)
 {
+       struct mtk_data *gpio_data = dev_get_drvdata(&pdev->dev);
        const __be32 *id = of_get_property(bank, "reg", NULL);
        struct mtk_gc *rg = devm_kzalloc(&pdev->dev,
                                sizeof(struct mtk_gc), GFP_KERNEL);
+       int ret;
 
        if (!rg || !id || be32_to_cpu(*id) > MTK_MAX_BANK)
                return -ENOMEM;
 
-       gc_map[be32_to_cpu(*id)] = rg;
+       gpio_data->gc_map[be32_to_cpu(*id)] = rg;
 
        memset(rg, 0, sizeof(struct mtk_gc));
 
@@ -169,25 +179,33 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, struct device_node *bank)
        rg->chip.get_direction = mediatek_gpio_get_direction;
        rg->chip.get = mediatek_gpio_get;
        rg->chip.set = mediatek_gpio_set;
-       if (mediatek_gpio_irq_domain)
+       if (gpio_data->gpio_irq_domain)
                rg->chip.to_irq = mediatek_gpio_to_irq;
        rg->bank = be32_to_cpu(*id);
 
+       ret = devm_gpiochip_add_data(&pdev->dev, &rg->chip, gpio_data);
+       if (ret < 0) {
+               dev_err(&pdev->dev, "Could not register gpio %d, ret=%d\n",
+                       rg->chip.ngpio, ret);
+               return ret;
+       }
+
        /* set polarity to low for all gpios */
        mtk_gpio_w32(rg, GPIO_REG_POL, 0);
 
        dev_info(&pdev->dev, "registering %d gpios\n", rg->chip.ngpio);
 
-       return gpiochip_add(&rg->chip);
+       return 0;
 }
 
 static void
 mediatek_gpio_irq_handler(struct irq_desc *desc)
 {
+       struct mtk_data *gpio_data = irq_desc_get_handler_data(desc);
        int i;
 
        for (i = 0; i < MTK_MAX_BANK; i++) {
-               struct mtk_gc *rg = gc_map[i];
+               struct mtk_gc *rg = gpio_data->gc_map[i];
                unsigned long pending;
                int bit;
 
@@ -197,7 +215,7 @@ mediatek_gpio_irq_handler(struct irq_desc *desc)
                pending = mtk_gpio_r32(rg, GPIO_REG_STAT);
 
                for_each_set_bit(bit, &pending, MTK_BANK_WIDTH) {
-                       u32 map = irq_find_mapping(mediatek_gpio_irq_domain,
+                       u32 map = irq_find_mapping(gpio_data->gpio_irq_domain,
                                                   (MTK_BANK_WIDTH * i) + bit);
 
                        generic_handle_irq(map);
@@ -209,9 +227,10 @@ mediatek_gpio_irq_handler(struct irq_desc *desc)
 static void
 mediatek_gpio_irq_unmask(struct irq_data *d)
 {
+       struct mtk_data *gpio_data = irq_data_get_irq_chip_data(d);
        int pin = d->hwirq;
        int bank = pin / 32;
-       struct mtk_gc *rg = gc_map[bank];
+       struct mtk_gc *rg = gpio_data->gc_map[bank];
        unsigned long flags;
        u32 rise, fall;
 
@@ -230,9 +249,10 @@ mediatek_gpio_irq_unmask(struct irq_data *d)
 static void
 mediatek_gpio_irq_mask(struct irq_data *d)
 {
+       struct mtk_data *gpio_data = irq_data_get_irq_chip_data(d);
        int pin = d->hwirq;
        int bank = pin / 32;
-       struct mtk_gc *rg = gc_map[bank];
+       struct mtk_gc *rg = gpio_data->gc_map[bank];
        unsigned long flags;
        u32 rise, fall;
 
@@ -251,9 +271,10 @@ mediatek_gpio_irq_mask(struct irq_data *d)
 static int
 mediatek_gpio_irq_type(struct irq_data *d, unsigned int type)
 {
+       struct mtk_data *gpio_data = irq_data_get_irq_chip_data(d);
        int pin = d->hwirq;
        int bank = pin / 32;
-       struct mtk_gc *rg = gc_map[bank];
+       struct mtk_gc *rg = gpio_data->gc_map[bank];
        u32 mask = BIT(d->hwirq);
 
        if (!rg)
@@ -291,6 +312,11 @@ static int
 mediatek_gpio_gpio_map(struct irq_domain *d, unsigned int irq,
                       irq_hw_number_t hw)
 {
+       int ret;
+
+       ret = irq_set_chip_data(irq, d->host_data);
+       if (ret < 0)
+               return ret;
        irq_set_chip_and_handler(irq, &mediatek_gpio_irq_chip,
                                 handle_level_irq);
        irq_set_handler_data(irq, d);
@@ -308,27 +334,35 @@ mediatek_gpio_probe(struct platform_device *pdev)
 {
        struct device_node *bank, *np = pdev->dev.of_node;
        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       struct mtk_data *gpio_data;
 
-       mediatek_gpio_membase = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(mediatek_gpio_membase))
-               return PTR_ERR(mediatek_gpio_membase);
+       gpio_data = devm_kzalloc(&pdev->dev, sizeof(*gpio_data), GFP_KERNEL);
+       if (!gpio_data)
+               return -ENOMEM;
+
+       gpio_data->gpio_membase = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(gpio_data->gpio_membase))
+               return PTR_ERR(gpio_data->gpio_membase);
 
-       mediatek_gpio_irq = irq_of_parse_and_map(np, 0);
-       if (mediatek_gpio_irq) {
-               mediatek_gpio_irq_domain = irq_domain_add_linear(np,
+       gpio_data->gpio_irq = irq_of_parse_and_map(np, 0);
+       if (gpio_data->gpio_irq) {
+               gpio_data->gpio_irq_domain = irq_domain_add_linear(np,
                        MTK_MAX_BANK * MTK_BANK_WIDTH,
-                       &irq_domain_ops, NULL);
-               if (!mediatek_gpio_irq_domain)
+                       &irq_domain_ops, gpio_data);
+               if (!gpio_data->gpio_irq_domain)
                        dev_err(&pdev->dev, "irq_domain_add_linear failed\n");
        }
 
+       platform_set_drvdata(pdev, gpio_data);
+
        for_each_child_of_node(np, bank)
                if (of_device_is_compatible(bank, "mediatek,mt7621-gpio-bank"))
                        mediatek_gpio_bank_probe(pdev, bank);
 
-       if (mediatek_gpio_irq_domain)
-               irq_set_chained_handler(mediatek_gpio_irq,
-                                       mediatek_gpio_irq_handler);
+       if (gpio_data->gpio_irq_domain)
+               irq_set_chained_handler_and_data(gpio_data->gpio_irq,
+                                                mediatek_gpio_irq_handler,
+                                                gpio_data);
 
        return 0;
 }