s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

[Ben Dooks]

[-- Attachment #1: simtec/ready/sdmmc-fix-missing-gpio-call.patch --]
[-- Type: text/plain, Size: 1187 bytes --]

Convert two missed s3c2410 specific gpio calls to gpiolib calls.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@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:31:33.000000000 +0000
+++ b/drivers/mmc/host/s3cmci.c	2009-11-03 22:53:23.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 = gpio_get_value(pdata->gpio_wprotect) ? 1 : 0;
+	ret ^= pdata->wprotect_invert;
 
 	return ret;
 }
@@ -1654,7 +1652,7 @@ static int __devinit s3cmci_probe(struct
 			goto probe_free_irq;
 		}
 
-		host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);
+		host->irq_cd = gpio_to_irq(host->pdata->gpio_detect);
 
 		if (host->irq_cd >= 0) {
 			if (request_irq(host->irq_cd, s3cmci_irq_cd,

-- 
Ben (ben@fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

[Ben Dooks]

An embedded and charset-unspecified text was scrubbed...
Name: simtec/ready/sdmmc-fix-missing-gpio-call.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20091110/549373ac/attachment.el>

s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

[Ben Dooks]

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@simtec.co.uk>
> Signed-off-by: Simtec Linux Team <linux@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.

s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

[Ben Dooks]

An embedded and charset-unspecified text was scrubbed...
Name: sdmmc-fix-missing-gpio-call.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20091103/50ad19a9/attachment.el>

s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

[Ben Dooks]

An embedded and charset-unspecified text was scrubbed...
Name: sdmmc-fix-missing-gpio-call.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20091103/2067033e/attachment.el>