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

Commit dcac5fe3 authored by Fabio Estevam's avatar Fabio Estevam Committed by Chris Ball
Browse files

mmc: mxs-mmc: 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 avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 6636bad8

drivers/mmc/host/mxs-mmc.c

+0 −8
Original line number Diff line number Diff line
@@ -41,7 +41,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/mxs-spi.h>
@@ -580,7 +579,6 @@ static int mxs_mmc_probe(struct platform_device *pdev) 
	struct mxs_mmc_host *host;

	struct mmc_host *mmc;

	struct resource *iores;

	struct pinctrl *pinctrl;

	int ret = 0, irq_err;

	struct regulator *reg_vmmc;

	enum of_gpio_flags flags;
@@ -620,12 +618,6 @@ static int mxs_mmc_probe(struct platform_device *pdev) 
		}

	}



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		goto out_mmc_free;

	}



	ssp->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(ssp->clk)) {

		ret = PTR_ERR(ssp->clk);