diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 20:26:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-12 20:43:37 +0400 |
| commit | 9b74fad508049471a8c783b9960b7834aba76293 (patch) | |
| tree | 367216ff80b4ff305b95a86a9de325ece5863f93 /sound/soc/atmel | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| download | blackbird-op-linux-9b74fad508049471a8c783b9960b7834aba76293.tar.gz blackbird-op-linux-9b74fad508049471a8c783b9960b7834aba76293.zip | |
ASoC: sam9g20ek: 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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 2d6fbd0125b9..802717eccbd0 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -38,8 +38,6 @@ #include <linux/platform_device.h> #include <linux/i2c.h> -#include <linux/pinctrl/consumer.h> - #include <linux/atmel-ssc.h> #include <sound/core.h> @@ -203,15 +201,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) struct device_node *codec_np, *cpu_np; struct clk *pllb; struct snd_soc_card *card = &snd_soc_at91sam9g20ek; - struct pinctrl *pinctrl; int ret; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - dev_err(&pdev->dev, "Failed to request pinctrl for mck\n"); - return PTR_ERR(pinctrl); - } - if (!np) { if (!(machine_is_at91sam9g20ek() || machine_is_at91sam9g20ek_2mmc())) |
