diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2013-10-13 18:17:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-14 14:18:30 +0100 |
| commit | 48afa793525800eff66a2e792037108b7f0d8613 (patch) | |
| tree | ac2f8628383b5fd0ed1c46fff403e45f573016b5 /sound/soc/atmel | |
| parent | 3a429eea10ded31d2ff088432d02072165a099f1 (diff) | |
| download | linux-48afa793525800eff66a2e792037108b7f0d8613.tar.gz linux-48afa793525800eff66a2e792037108b7f0d8613.tar.bz2 linux-48afa793525800eff66a2e792037108b7f0d8613.zip | |
ASoC: atmel: 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.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Acked-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/atmel_wm8904.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c index 7222380131ea..b4e36901a40b 100644 --- a/sound/soc/atmel/atmel_wm8904.c +++ b/sound/soc/atmel/atmel_wm8904.c @@ -12,7 +12,6 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> -#include <linux/pinctrl/consumer.h> #include <sound/soc.h> @@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev) struct snd_soc_card *card = &atmel_asoc_wm8904_card; struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink; struct clk *clk_src; - struct pinctrl *pinctrl; int id, ret; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - dev_err(&pdev->dev, "failed to request pinctrl\n"); - return PTR_ERR(pinctrl); - } - card->dev = &pdev->dev; ret = atmel_asoc_wm8904_dt_init(pdev); if (ret) { |