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

Commit 11e91689 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 2a5c37ca e9b3db66

drivers/spi/spi-imx.c

+0 −8
Original line number Diff line number Diff line
@@ -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>
@@ -759,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) {
@@ -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);