s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

Ben Dooks ben-linux at fluff.org
Tue Nov 3 17:54:51 EST 2009


On Tue, Nov 03, 2009 at 10:50:07PM +0000, Ben Dooks wrote:
> Convert two missed s3c2410 specific gpio calls to gpiolib calls.
> 
> Signed-off-by: Ben Dooks <ben at simtec.co.uk>
> Signed-off-by: Simtec Linux Team <linux at simtec.co.uk>
> 
> ---
>  drivers/mmc/host/s3cmci.c |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> Index: b/drivers/mmc/host/s3cmci.c
> ===================================================================
> --- a/drivers/mmc/host/s3cmci.c	2009-11-03 22:17:12.000000000 +0000
> +++ b/drivers/mmc/host/s3cmci.c	2009-11-03 22:22:33.000000000 +0000
> @@ -1302,10 +1302,8 @@ static int s3cmci_get_ro(struct mmc_host
>  	if (pdata->no_wprotect)
>  		return 0;
>  
> -	ret = s3c2410_gpio_getpin(pdata->gpio_wprotect);
> -
> -	if (pdata->wprotect_invert)
> -		ret = !ret;
> +	ret = s3c2410_gpio_getpin(pdata->gpio_wprotect) ? 1 : 0;
> +	ret ^= pdata->wprotect_invert;

gah, should have been gpio_get_value(), reposted.

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.




More information about the linux-arm-kernel mailing list