diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-06 15:06:01 -0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-12 20:47:51 +0400 |
| commit | e76af6d189075a0ca59bc654157e80da53559fb0 (patch) | |
| tree | c4af1e9c42159056d220ac65eef064a92d3eafc6 /sound/soc/mxs | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| download | linux-stable-e76af6d189075a0ca59bc654157e80da53559fb0.tar.gz linux-stable-e76af6d189075a0ca59bc654157e80da53559fb0.tar.bz2 linux-stable-e76af6d189075a0ca59bc654157e80da53559fb0.zip | |
ASoC: mxs: mxs-saif: 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.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/mxs')
| -rw-r--r-- | sound/soc/mxs/mxs-saif.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index d31dc52fa862..71a972f5af97 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -27,7 +27,6 @@ #include <linux/delay.h> #include <linux/time.h> #include <linux/fsl/mxs-dma.h> -#include <linux/pinctrl/consumer.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -667,7 +666,6 @@ static int mxs_saif_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct resource *iores, *dmares; struct mxs_saif *saif; - struct pinctrl *pinctrl; int ret = 0; struct device_node *master; @@ -707,12 +705,6 @@ static int mxs_saif_probe(struct platform_device *pdev) mxs_saif[saif->id] = saif; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - ret = PTR_ERR(pinctrl); - return ret; - } - saif->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(saif->clk)) { ret = PTR_ERR(saif->clk); |