diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-10-13 12:17:50 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-14 09:18:30 -0400 |
commit | 48afa793525800eff66a2e792037108b7f0d8613 (patch) | |
tree | ac2f8628383b5fd0ed1c46fff403e45f573016b5 /sound/soc/atmel | |
parent | 3a429eea10ded31d2ff088432d02072165a099f1 (diff) |
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 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/of.h> | 13 | #include <linux/of.h> |
14 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
15 | #include <linux/pinctrl/consumer.h> | ||
16 | 15 | ||
17 | #include <sound/soc.h> | 16 | #include <sound/soc.h> |
18 | 17 | ||
@@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev) | |||
155 | struct snd_soc_card *card = &atmel_asoc_wm8904_card; | 154 | struct snd_soc_card *card = &atmel_asoc_wm8904_card; |
156 | struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink; | 155 | struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink; |
157 | struct clk *clk_src; | 156 | struct clk *clk_src; |
158 | struct pinctrl *pinctrl; | ||
159 | int id, ret; | 157 | int id, ret; |
160 | 158 | ||
161 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
162 | if (IS_ERR(pinctrl)) { | ||
163 | dev_err(&pdev->dev, "failed to request pinctrl\n"); | ||
164 | return PTR_ERR(pinctrl); | ||
165 | } | ||
166 | |||
167 | card->dev = &pdev->dev; | 159 | card->dev = &pdev->dev; |
168 | ret = atmel_asoc_wm8904_dt_init(pdev); | 160 | ret = atmel_asoc_wm8904_dt_init(pdev); |
169 | if (ret) { | 161 | if (ret) { |