Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0514dd76 authored by Mark Brown's avatar Mark Brown
Browse files

spi/omap2: Let device core handle pinctrl 



Since commit ab78029e (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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f722406f

drivers/spi/spi-omap2-mcspi.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/pinctrl/consumer.h>





#include <linux/spi/spi.h>

#include <linux/spi/spi.h>
@@ -1186,7 +1185,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev) 
	static int		bus_num = 1;

	static int		bus_num = 1;

	struct device_node	*node = pdev->dev.of_node;

	struct device_node	*node = pdev->dev.of_node;

	const struct of_device_id *match;

	const struct of_device_id *match;

	struct pinctrl *pinctrl;





	master = spi_alloc_master(&pdev->dev, sizeof *mcspi);

	master = spi_alloc_master(&pdev->dev, sizeof *mcspi);

	if (master == NULL) {

	if (master == NULL) {
@@ -1284,11 +1282,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev) 
	if (status < 0)

	if (status < 0)

		goto dma_chnl_free;

		goto dma_chnl_free;





	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl))

		dev_warn(&pdev->dev,

				"pins are not configured from the driver\n");



	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);

	pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);

	pm_runtime_enable(&pdev->dev);

	pm_runtime_enable(&pdev->dev);