diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-10-13 12:17:49 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@gmail.com> | 2013-10-15 06:16:35 -0400 |
commit | faed9c380860d986886e8a8b79b29bb3d1ac2a91 (patch) | |
tree | 07c0493accecc977bff17dde9d8a2e5e87c3a26d /drivers/pwm | |
parent | becbca1390a5147b363a34e238e74cffe65eecc3 (diff) |
pwm: don't use devm_pinctrl_get_select_default() in probe
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r-- | drivers/pwm/pwm-tiecap.c | 6 | ||||
-rw-r--r-- | drivers/pwm/pwm-tiehrpwm.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/pwm/pwm-tiecap.c b/drivers/pwm/pwm-tiecap.c index c2e2e5852362..4e5c3d13d4f8 100644 --- a/drivers/pwm/pwm-tiecap.c +++ b/drivers/pwm/pwm-tiecap.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/pm_runtime.h> | 26 | #include <linux/pm_runtime.h> |
27 | #include <linux/pwm.h> | 27 | #include <linux/pwm.h> |
28 | #include <linux/of_device.h> | 28 | #include <linux/of_device.h> |
29 | #include <linux/pinctrl/consumer.h> | ||
30 | 29 | ||
31 | #include "pwm-tipwmss.h" | 30 | #include "pwm-tipwmss.h" |
32 | 31 | ||
@@ -208,11 +207,6 @@ static int ecap_pwm_probe(struct platform_device *pdev) | |||
208 | struct clk *clk; | 207 | struct clk *clk; |
209 | struct ecap_pwm_chip *pc; | 208 | struct ecap_pwm_chip *pc; |
210 | u16 status; | 209 | u16 status; |
211 | struct pinctrl *pinctrl; | ||
212 | |||
213 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
214 | if (IS_ERR(pinctrl)) | ||
215 | dev_warn(&pdev->dev, "unable to select pin group\n"); | ||
216 | 210 | ||
217 | pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); | 211 | pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); |
218 | if (!pc) { | 212 | if (!pc) { |
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c index 084f55246532..a4d8f519d965 100644 --- a/drivers/pwm/pwm-tiehrpwm.c +++ b/drivers/pwm/pwm-tiehrpwm.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
27 | #include <linux/pm_runtime.h> | 27 | #include <linux/pm_runtime.h> |
28 | #include <linux/of_device.h> | 28 | #include <linux/of_device.h> |
29 | #include <linux/pinctrl/consumer.h> | ||
30 | 29 | ||
31 | #include "pwm-tipwmss.h" | 30 | #include "pwm-tipwmss.h" |
32 | 31 | ||
@@ -439,11 +438,6 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev) | |||
439 | struct clk *clk; | 438 | struct clk *clk; |
440 | struct ehrpwm_pwm_chip *pc; | 439 | struct ehrpwm_pwm_chip *pc; |
441 | u16 status; | 440 | u16 status; |
442 | struct pinctrl *pinctrl; | ||
443 | |||
444 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
445 | if (IS_ERR(pinctrl)) | ||
446 | dev_warn(&pdev->dev, "unable to select pin group\n"); | ||
447 | 441 | ||
448 | pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); | 442 | pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); |
449 | if (!pc) { | 443 | if (!pc) { |