Commit 9f888b55 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: omap_hsmmc: Convert to pinctrl_select_default_state() 



Let's drop the boilerplate code for managing the default pinctrl state and
convert into using the new pinctrl_select_default_state().

Additionally, move away from using pinctrl_pm_select_default_state() as
it's scheduled for removal and use pinctrl_select_default_state() instead.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20191206170821.29711-6-ulf.hansson@linaro.org
parent c17e73c3

drivers/mmc/host/omap_hsmmc.c

+2 −8
Original line number Diff line number Diff line
@@ -1605,12 +1605,6 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host) 
			ret = PTR_ERR(p);

			goto err_free_irq;

		}

		if (IS_ERR(pinctrl_lookup_state(p, PINCTRL_STATE_DEFAULT))) {

			dev_info(host->dev, "missing default pinctrl state\n");

			devm_pinctrl_put(p);

			ret = -EINVAL;

			goto err_free_irq;

		}



		if (IS_ERR(pinctrl_lookup_state(p, PINCTRL_STATE_IDLE))) {

			dev_info(host->dev, "missing idle pinctrl state\n");
@@ -2153,14 +2147,14 @@ static int omap_hsmmc_runtime_resume(struct device *dev) 
	if ((host->mmc->caps & MMC_CAP_SDIO_IRQ) &&

	    (host->flags & HSMMC_SDIO_IRQ_ENABLED)) {



		pinctrl_pm_select_default_state(host->dev);

		pinctrl_select_default_state(host->dev);



		/* irq lost, if pinmux incorrect */

		OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);

		OMAP_HSMMC_WRITE(host->base, ISE, CIRQ_EN);

		OMAP_HSMMC_WRITE(host->base, IE, CIRQ_EN);

	} else {

		pinctrl_pm_select_default_state(host->dev);

		pinctrl_select_default_state(host->dev);

	}

	spin_unlock_irqrestore(&host->irq_lock, flags);

	return 0;