diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 15:32:09 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 10:12:56 -0400 |
commit | 0514dd76ea556859d398aaff725817e1c97579ea (patch) | |
tree | a4de254c3764c2a9426a06f22c1f2c574fa25778 /drivers/spi/spi-omap2-mcspi.c | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
spi/omap2: Let device core handle pinctrl
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
-rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 86d2158946bb..000922abcb87 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <linux/pm_runtime.h> | 38 | #include <linux/pm_runtime.h> |
39 | #include <linux/of.h> | 39 | #include <linux/of.h> |
40 | #include <linux/of_device.h> | 40 | #include <linux/of_device.h> |
41 | #include <linux/pinctrl/consumer.h> | ||
42 | 41 | ||
43 | #include <linux/spi/spi.h> | 42 | #include <linux/spi/spi.h> |
44 | 43 | ||
@@ -1186,7 +1185,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev) | |||
1186 | static int bus_num = 1; | 1185 | static int bus_num = 1; |
1187 | struct device_node *node = pdev->dev.of_node; | 1186 | struct device_node *node = pdev->dev.of_node; |
1188 | const struct of_device_id *match; | 1187 | const struct of_device_id *match; |
1189 | struct pinctrl *pinctrl; | ||
1190 | 1188 | ||
1191 | master = spi_alloc_master(&pdev->dev, sizeof *mcspi); | 1189 | master = spi_alloc_master(&pdev->dev, sizeof *mcspi); |
1192 | if (master == NULL) { | 1190 | if (master == NULL) { |
@@ -1284,11 +1282,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev) | |||
1284 | if (status < 0) | 1282 | if (status < 0) |
1285 | goto dma_chnl_free; | 1283 | goto dma_chnl_free; |
1286 | 1284 | ||
1287 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
1288 | if (IS_ERR(pinctrl)) | ||
1289 | dev_warn(&pdev->dev, | ||
1290 | "pins are not configured from the driver\n"); | ||
1291 | |||
1292 | pm_runtime_use_autosuspend(&pdev->dev); | 1285 | pm_runtime_use_autosuspend(&pdev->dev); |
1293 | pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); | 1286 | pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); |
1294 | pm_runtime_enable(&pdev->dev); | 1287 | pm_runtime_enable(&pdev->dev); |