From mboxrd@z Thu Jan 1 00:00:00 1970 From: j-keerthy@ti.com (Keerthy) Date: Tue, 18 Jul 2017 16:27:13 +0530 Subject: [PATCH 1/4] gpio: davinci: Use devm_gpiochip_add_data in place of gpiochip_add_data In-Reply-To: <1500375436-9435-1-git-send-email-j-keerthy@ti.com> References: <1500375436-9435-1-git-send-email-j-keerthy@ti.com> Message-ID: <1500375436-9435-2-git-send-email-j-keerthy@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Use the devm version of gpiochip_add_data and pass on the return value. Reset the static variables to 0 before returning. Signed-off-by: Keerthy --- drivers/gpio/gpio-davinci.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 65cb359..2c88054 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -166,7 +166,7 @@ static int davinci_gpio_get(struct gpio_chip *chip, unsigned offset) static int davinci_gpio_probe(struct platform_device *pdev) { static int ctrl_num, bank_base; - int gpio, bank; + int gpio, bank, ret = 0; unsigned ngpio, nbank; struct davinci_gpio_controller *chips; struct davinci_gpio_platform_data *pdata; @@ -232,7 +232,13 @@ static int davinci_gpio_probe(struct platform_device *pdev) for (gpio = 0, bank = 0; gpio < ngpio; gpio += 32, bank++) chips->regs[bank] = gpio_base + offset_array[bank]; - gpiochip_add_data(&chips->chip, chips); + ret = devm_gpiochip_add_data(dev, &chips->chip, chips); + if (ret) { + ctrl_num = 0; + bank_base = 0; + return ret; + } + platform_set_drvdata(pdev, chips); davinci_gpio_irq_setup(pdev); return 0; -- 1.9.1