]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
spi: spi-imx: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 6 May 2013 18:05:55 +0000 (15:05 -0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 May 2013 14:12:09 +0000 (18:12 +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-imx.c

index 0befeeb522f47ab633b1d54b76cf780902d2ae2b..9821ef1deb6f7494ea7cb6f656781b2d3859666e 100644 (file)
@@ -37,7 +37,6 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
-#include <linux/pinctrl/consumer.h>
 
 #include <linux/platform_data/spi-imx.h>
 
@@ -760,7 +759,6 @@ static int spi_imx_probe(struct platform_device *pdev)
        struct spi_master *master;
        struct spi_imx_data *spi_imx;
        struct resource *res;
-       struct pinctrl *pinctrl;
        int i, ret, num_cs;
 
        if (!np && !mxc_platform_info) {
@@ -848,12 +846,6 @@ static int spi_imx_probe(struct platform_device *pdev)
                goto out_iounmap;
        }
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl)) {
-               ret = PTR_ERR(pinctrl);
-               goto out_free_irq;
-       }
-
        spi_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
        if (IS_ERR(spi_imx->clk_ipg)) {
                ret = PTR_ERR(spi_imx->clk_ipg);