ASoC: sam9g20ek: Let device core handle pinctrl
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 May 2013 19:26:03 +0000 (20:26 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 12 May 2013 16:43:37 +0000 (20:43 +0400)
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>
sound/soc/atmel/sam9g20_wm8731.c

index 2d6fbd0125b9a6b6411a256c6d3e950d6be34878..802717eccbd010d1a43f104e87004a28e56c3f30 100644 (file)
@@ -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()))