diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-06 14:05:54 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@gmail.com> | 2013-05-27 11:48:33 -0400 |
commit | e7927141ed51d94d6e1267f2ff0362a1f255e007 (patch) | |
tree | 38bfd9177a6572e60440631e05ecdae5b7dbe31e /drivers/pwm | |
parent | aa3495f7922a51c893b0e4a376a225f02da74c76 (diff) |
pwm: mxs: 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.
Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: <linux-kernel@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r-- | drivers/pwm/pwm-mxs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c index 3febdddf71f9..6489a4b75943 100644 --- a/drivers/pwm/pwm-mxs.c +++ b/drivers/pwm/pwm-mxs.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/of.h> | 17 | #include <linux/of.h> |
18 | #include <linux/of_address.h> | 18 | #include <linux/of_address.h> |
19 | #include <linux/pinctrl/consumer.h> | ||
20 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
21 | #include <linux/pwm.h> | 20 | #include <linux/pwm.h> |
22 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
@@ -130,7 +129,6 @@ static int mxs_pwm_probe(struct platform_device *pdev) | |||
130 | struct device_node *np = pdev->dev.of_node; | 129 | struct device_node *np = pdev->dev.of_node; |
131 | struct mxs_pwm_chip *mxs; | 130 | struct mxs_pwm_chip *mxs; |
132 | struct resource *res; | 131 | struct resource *res; |
133 | struct pinctrl *pinctrl; | ||
134 | int ret; | 132 | int ret; |
135 | 133 | ||
136 | mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL); | 134 | mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL); |
@@ -142,10 +140,6 @@ static int mxs_pwm_probe(struct platform_device *pdev) | |||
142 | if (IS_ERR(mxs->base)) | 140 | if (IS_ERR(mxs->base)) |
143 | return PTR_ERR(mxs->base); | 141 | return PTR_ERR(mxs->base); |
144 | 142 | ||
145 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
146 | if (IS_ERR(pinctrl)) | ||
147 | return PTR_ERR(pinctrl); | ||
148 | |||
149 | mxs->clk = devm_clk_get(&pdev->dev, NULL); | 143 | mxs->clk = devm_clk_get(&pdev->dev, NULL); |
150 | if (IS_ERR(mxs->clk)) | 144 | if (IS_ERR(mxs->clk)) |
151 | return PTR_ERR(mxs->clk); | 145 | return PTR_ERR(mxs->clk); |