1 files changed, 3 insertions, 14 deletions

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 0befeeb522f4..7db4f43ee4d8 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -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>
 
@@ -698,11 +697,10 @@ static int spi_imx_setupxfer(struct spi_device *spi,
         } else if (config.bpw <= 16) {
                 spi_imx->rx = spi_imx_buf_rx_u16;
                 spi_imx->tx = spi_imx_buf_tx_u16;
-        } else if (config.bpw <= 32) {
+        } else {
                 spi_imx->rx = spi_imx_buf_rx_u32;
                 spi_imx->tx = spi_imx_buf_tx_u32;
-        } else
-                BUG();
+        }
 
         spi_imx->devtype_data->config(spi_imx, &config);
 
@@ -760,7 +758,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) {
@@ -783,6 +780,7 @@ static int spi_imx_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, master);
 
+        master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
         master->bus_num = pdev->id;
         master->num_chipselect = num_cs;
 
@@ -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);
@@ -902,7 +894,6 @@ out_gpio_free:
         }
         spi_master_put(master);
         kfree(master);
-        platform_set_drvdata(pdev, NULL);
         return ret;
 }
 
@@ -929,8 +920,6 @@ static int spi_imx_remove(struct platform_device *pdev)
 
         release_mem_region(res->start, resource_size(res));
 
-        platform_set_drvdata(pdev, NULL);
-
         return 0;
 }