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

Commit edaf6d3d authored by Ulf Hansson's avatar Ulf Hansson Committed by Russell King
Browse files

ARM: 7831/1: mmc: mmci: Adapt to new pinctrl handling 



There is no need for every driver to fetch a pinctrl handle and to
select the default state. Instead this is handled by the device driver
core, thus we can remove this piece of code from mmci.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 272b98c6

drivers/mmc/host/mmci.c

+0 −17
Original line number Diff line number Diff line
@@ -1510,23 +1510,6 @@ static int mmci_probe(struct amba_device *dev, 
		mmc->f_max = min(host->mclk, fmax);

	dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max);



	host->pinctrl = devm_pinctrl_get(&dev->dev);

	if (IS_ERR(host->pinctrl)) {

		ret = PTR_ERR(host->pinctrl);

		goto clk_disable;

	}



	host->pins_default = pinctrl_lookup_state(host->pinctrl,

			PINCTRL_STATE_DEFAULT);



	/* enable pins to be muxed in and configured */

	if (!IS_ERR(host->pins_default)) {

		ret = pinctrl_select_state(host->pinctrl, host->pins_default);

		if (ret)

			dev_warn(&dev->dev, "could not set default pins\n");

	} else

		dev_warn(&dev->dev, "could not get default pinstate\n");



	/* Get regulators and the supported OCR mask */

	mmc_regulator_get_supply(mmc);

	if (!mmc->ocr_avail)

drivers/mmc/host/mmci.h

+0 −4
Original line number Diff line number Diff line
@@ -200,10 +200,6 @@ struct mmci_host { 
	struct sg_mapping_iter	sg_miter;

	unsigned int		size;



	/* pinctrl handles */

	struct pinctrl		*pinctrl;

	struct pinctrl_state	*pins_default;



#ifdef CONFIG_DMA_ENGINE

	/* DMA stuff */

	struct dma_chan		*dma_current;