spi: spi-mxs: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 6 May 2013 18:05:56 +0000 (15:05 -0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 May 2013 14:19:08 +0000 (18:19 +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>
drivers/spi/spi-mxs.c

index 8498276..88fe1cf 100644 (file)
@@ -46,7 +46,6 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/stmp_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/mxs-spi.h>
@@ -506,7 +505,6 @@ static int mxs_spi_probe(struct platform_device *pdev)
        struct mxs_spi *spi;
        struct mxs_ssp *ssp;
        struct resource *iores;
-       struct pinctrl *pinctrl;
        struct clk *clk;
        void __iomem *base;
        int devid, clk_freq;
@@ -528,10 +526,6 @@ static int mxs_spi_probe(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl))
-               return PTR_ERR(pinctrl);
-
        clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(clk))
                return PTR_ERR(clk);