From: anilkumar@ti.com (AnilKumar Ch)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] leds: leds-gpio: adopt pinctrl support
Date: Fri, 31 Aug 2012 14:59:20 +0530 [thread overview]
Message-ID: <1346405361-29711-5-git-send-email-anilkumar@ti.com> (raw)
In-Reply-To: <1346405361-29711-1-git-send-email-anilkumar@ti.com>
Adopt pinctrl support to leds-gpio driver, based on the device
pointer (leds-gpio) pinctrl driver configure SoC pins to GPIO
mode.
Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
---
drivers/leds/leds-gpio.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index c032b21..d98dfb9 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -20,6 +20,7 @@
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/module.h>
+#include <linux/pinctrl/consumer.h>
struct gpio_led_data {
struct led_classdev cdev;
@@ -236,14 +237,23 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
{
struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
struct gpio_leds_priv *priv;
- int i, ret = 0;
+ struct pinctrl *pinctrl;
+ int i = 0;
+ int ret = 0;
+
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+ if (IS_ERR(pinctrl)) {
+ return PTR_ERR(pinctrl);
+ }
if (pdata && pdata->num_leds) {
priv = devm_kzalloc(&pdev->dev,
sizeof_gpio_leds_priv(pdata->num_leds),
GFP_KERNEL);
- if (!priv)
- return -ENOMEM;
+ if (!priv) {
+ ret = -ENOMEM;
+ goto err_pctrl_put;
+ }
priv->num_leds = pdata->num_leds;
for (i = 0; i < priv->num_leds; i++) {
@@ -254,18 +264,25 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
/* On failure: unwind the led creations */
for (i = i - 1; i >= 0; i--)
delete_gpio_led(&priv->leds[i]);
- return ret;
+ goto err_pctrl_put;
}
}
} else {
priv = gpio_leds_create_of(pdev);
- if (!priv)
- return -ENODEV;
+ if (!priv) {
+ ret = -ENODEV;
+ goto err_del_gpio_led;
+ }
}
platform_set_drvdata(pdev, priv);
- return 0;
+err_pctrl_put:
+ pinctrl_put(pinctrl);
+err_del_gpio_led:
+ while (--i >= 0)
+ delete_gpio_led(&priv->leds[i]);
+ return ret;
}
static int __devexit gpio_led_remove(struct platform_device *pdev)
--
1.7.9.5
next prev parent reply other threads:[~2012-08-31 9:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-31 9:29 [PATCH v5 0/5] Add device tree data for AM33XX devices AnilKumar Ch
2012-08-31 9:29 ` [PATCH v5 1/5] arm/dts: AM33XX: Add basic pinctrl device tree data AnilKumar Ch
2012-09-05 23:32 ` Tony Lindgren
2012-09-06 6:17 ` AnilKumar, Chimata
2012-08-31 9:29 ` [PATCH v5 2/5] arm/dts: AM33XX: Configure pinmuxs for user leds control on Bone AnilKumar Ch
2012-08-31 9:29 ` [PATCH v5 3/5] arm/dts: AM33XX: Add D_CAN device tree data AnilKumar Ch
2012-08-31 9:29 ` AnilKumar Ch [this message]
2012-08-31 16:04 ` [PATCH 4/5] leds: leds-gpio: adopt pinctrl support Tony Lindgren
2012-08-31 17:54 ` AnilKumar, Chimata
2012-08-31 9:29 ` [PATCH 5/5] of: Modify c_can binding documentation AnilKumar Ch
2012-09-01 7:05 ` AnilKumar, Chimata
2012-09-02 2:02 ` Stephen Warren
2012-09-03 4:35 ` AnilKumar, Chimata
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=1346405361-29711-5-git-send-email-anilkumar@ti.com \
--to=anilkumar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).