From: Keerthy <j-keerthy@ti.com>
To: linus.walleij@linaro.org
Cc: j-keerthy@ti.com, nsekhar@ti.com, t-kristo@ti.com,
linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
fcooper@ti.com
Subject: [PATCH v2 1/3] gpio: davinci: Use devm_gpiochip_add_data in place of gpiochip_add_data
Date: Thu, 20 Jul 2017 15:12:16 +0530 [thread overview]
Message-ID: <1500543738-9696-2-git-send-email-j-keerthy@ti.com> (raw)
In-Reply-To: <1500543738-9696-1-git-send-email-j-keerthy@ti.com>
Use the devm version of gpiochip_add_data and pass on the
return value. This avoids memory leak due to gpiochip_add_data
in case the driver is unbound.
Signed-off-by: Keerthy <j-keerthy@ti.com>
---
Changes in v2:
* Restoring the previous values of ctrl_num and bank_base in case of an error.
drivers/gpio/gpio-davinci.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 65cb359..27499ec 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,10 +232,20 @@ 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)
+ goto err;
+
platform_set_drvdata(pdev, chips);
davinci_gpio_irq_setup(pdev);
return 0;
+
+err:
+ /* Revert the static variable increments */
+ ctrl_num--;
+ bank_base -= ngpio;
+
+ return ret;
}
/*--------------------------------------------------------------------------*/
--
1.9.1
next prev parent reply other threads:[~2017-07-20 9:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-20 9:42 [PATCH v2 0/3] gpio: davinci: Add missing return checks Keerthy
2017-07-20 9:42 ` Keerthy [this message]
2017-08-02 9:23 ` [PATCH v2 1/3] gpio: davinci: Use devm_gpiochip_add_data in place of gpiochip_add_data Linus Walleij
2017-07-20 9:42 ` [PATCH v2 2/3] gpio: davinci: Handle the return value of davinci_gpio_irq_setup function Keerthy
2017-08-02 10:59 ` Keerthy
2017-08-07 12:12 ` Linus Walleij
2017-08-07 12:38 ` Keerthy
2017-08-07 13:33 ` Linus Walleij
2017-07-20 9:42 ` [PATCH v2 3/3] gpio: davinci: Convert prinkt to dev_err Keerthy
2017-08-02 9:25 ` Linus Walleij
2017-07-20 9:43 ` [PATCH v2 0/3] gpio: davinci: Add missing return checks Keerthy
2017-07-20 19:57 ` Suman Anna
2017-07-31 11:52 ` Keerthy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500543738-9696-2-git-send-email-j-keerthy@ti.com \
--to=j-keerthy@ti.com \
--cc=fcooper@ti.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=t-kristo@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).