staging: mt7621-gpio: assign gpio chip custom changes after bgpio_init

bgpio_init function set different data of the gpio chip, like the name.
We want specific name for each bank so to get that not overwritten
move all custom changes after the bgpio_init function call.

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 ccf2aa85d665c6f82bb9a1bbbc1f98826cb67604..1b4588ab1ec1e6927af91ec75b62f7b9968dc14d 100644 (file)
--- a/drivers/staging/mt7621-gpio/gpio-mt7621.c
+++ b/drivers/staging/mt7621-gpio/gpio-mt7621.c
@@ -236,9 +236,6 @@ mediatek_gpio_bank_probe(struct platform_device *pdev,
        spin_lock_init(&rg->lock);
        rg->chip.of_node = node;
        rg->bank = bank;
-       rg->chip.of_gpio_n_cells = 2;
-       rg->chip.of_xlate = mediatek_gpio_xlate;
-       rg->chip.label = mediatek_gpio_bank_name(rg->bank);
 
        dat = gpio->gpio_membase + GPIO_REG_DATA + (rg->bank * GPIO_BANK_WIDE);
        set = gpio->gpio_membase + GPIO_REG_DSET + (rg->bank * GPIO_BANK_WIDE);
@@ -252,6 +249,10 @@ mediatek_gpio_bank_probe(struct platform_device *pdev,
                return ret;
        }
 
+       rg->chip.of_gpio_n_cells = 2;
+       rg->chip.of_xlate = mediatek_gpio_xlate;
+       rg->chip.label = mediatek_gpio_bank_name(rg->bank);
+
        ret = devm_gpiochip_add_data(&pdev->dev, &rg->chip, gpio);
        if (ret < 0) {
                dev_err(&pdev->dev, "Could not register gpio %d, ret=%d\n",