]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: mxs: mxs-saif: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 6 May 2013 18:06:01 +0000 (15:06 -0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 12 May 2013 16:47:51 +0000 (20:47 +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: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/mxs/mxs-saif.c

index d31dc52fa8626ff2fcb04931cc815873f8e94067..71a972f5af97cbad72a35b8cde35db993d3c65e1 100644 (file)
@@ -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);