Re: [PATCH 4/9] mmc: usdhi6rol0: Convert to pinctrl_select_default_state()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Dec 06, 2019 at 06:08:16PM +0100, Ulf Hansson wrote:
> Let's drop the boilerplate code for managing the default pinctrl state and
> convert into using the new pinctrl_select_default_state().

Looks good, thanks!

Acked-by: Jesper Nilsson <jesper.nilsson@xxxxxxxx>

> Cc: Lars Persson <lars.persson@xxxxxxxx>
> Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> ---
>  drivers/mmc/host/usdhi6rol0.c | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c
> index b11ac2314328..969a34e698f2 100644
> --- a/drivers/mmc/host/usdhi6rol0.c
> +++ b/drivers/mmc/host/usdhi6rol0.c
> @@ -199,7 +199,6 @@ struct usdhi6_host {
>  
>  	/* Pin control */
>  	struct pinctrl *pinctrl;
> -	struct pinctrl_state *pins_default;
>  	struct pinctrl_state *pins_uhs;
>  };
>  
> @@ -1162,8 +1161,7 @@ static int usdhi6_set_pinstates(struct usdhi6_host *host, int voltage)
>  					    host->pins_uhs);
>  
>  	default:
> -		return pinctrl_select_state(host->pinctrl,
> -					    host->pins_default);
> +		return pinctrl_select_default_state(mmc_dev(host->mmc));
>  	}
>  }
>  
> @@ -1770,17 +1768,6 @@ static int usdhi6_probe(struct platform_device *pdev)
>  	}
>  
>  	host->pins_uhs = pinctrl_lookup_state(host->pinctrl, "state_uhs");
> -	if (!IS_ERR(host->pins_uhs)) {
> -		host->pins_default = pinctrl_lookup_state(host->pinctrl,
> -							  PINCTRL_STATE_DEFAULT);
> -
> -		if (IS_ERR(host->pins_default)) {
> -			dev_err(dev,
> -				"UHS pinctrl requires a default pin state.\n");
> -			ret = PTR_ERR(host->pins_default);
> -			goto e_free_mmc;
> -		}
> -	}
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	host->base = devm_ioremap_resource(dev, res);
> -- 
> 2.17.1
> 

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@xxxxxxxx



[Index of Archives]     [Linux SPI]     [Linux Kernel]     [Linux ARM (vger)]     [Linux ARM MSM]     [Linux Omap]     [Linux Arm]     [Linux Tegra]     [Fedora ARM]     [Linux for Samsung SOC]     [eCos]     [Linux Fastboot]     [Gcc Help]     [Git]     [DCCP]     [IETF Announce]     [Security]     [Linux MIPS]     [Yosemite Campsites]

  Powered by Linux