Merge remote-tracking branch 'spi/topic/mxs' into spi-next

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 62b7e8ee1163..424d38e59421 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -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>
@@ -500,7 +499,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;
@@ -522,10 +520,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);