diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-20 11:23:45 -0400 |
|---|---|---|
| committer | Bryan Wu <cooloney@gmail.com> | 2013-06-20 19:21:33 -0400 |
| commit | bfa855bad39b7a266c00efdd2dc5887bcd41bb70 (patch) | |
| tree | ca7ce15dfbe477640766f1e8ba50e49666159b09 /drivers | |
| parent | 28720cff9feeb705a39f54c196bc529fb33d1542 (diff) | |
leds: leds-gpio: Let device core handle pinctrl
Since commit ab78029 (drivers/pinctrl: grab default handles from device core)
we can rely on device core for handling pinctrl, so remove
devm_pinctrl_get_select_default() from the driver.
Reported-by: Stephen Warren <warren@wwwdotorg.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/leds/leds-gpio.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 02c4cc1f39b2..84d74c373cae 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 21 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/pinctrl/consumer.h> | ||
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | 24 | ||
| 26 | struct gpio_led_data { | 25 | struct gpio_led_data { |
| @@ -236,13 +235,8 @@ static int gpio_led_probe(struct platform_device *pdev) | |||
| 236 | { | 235 | { |
| 237 | struct gpio_led_platform_data *pdata = pdev->dev.platform_data; | 236 | struct gpio_led_platform_data *pdata = pdev->dev.platform_data; |
| 238 | struct gpio_leds_priv *priv; | 237 | struct gpio_leds_priv *priv; |
| 239 | struct pinctrl *pinctrl; | ||
| 240 | int i, ret = 0; | 238 | int i, ret = 0; |
| 241 | 239 | ||
| 242 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
| 243 | if (IS_ERR(pinctrl)) | ||
| 244 | dev_warn(&pdev->dev, | ||
| 245 | "pins are not configured from the driver\n"); | ||
| 246 | 240 | ||
| 247 | if (pdata && pdata->num_leds) { | 241 | if (pdata && pdata->num_leds) { |
| 248 | priv = devm_kzalloc(&pdev->dev, | 242 | priv = devm_kzalloc(&pdev->dev, |
