Browse Source

s3cmci: convert missed s3c2410_gpio calls to gpiolib calls

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>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Ben Dooks 15 years ago
parent
commit
c78402e95d
1 changed files with 3 additions and 5 deletions
  1. 3 5
      drivers/mmc/host/s3cmci.c

+ 3 - 5
drivers/mmc/host/s3cmci.c

@@ -1303,10 +1303,8 @@ static int s3cmci_get_ro(struct mmc_host *mmc)
 	if (pdata->no_wprotect)
 	if (pdata->no_wprotect)
 		return 0;
 		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;
 	return ret;
 }
 }
@@ -1655,7 +1653,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
 			goto probe_free_irq;
 			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 (host->irq_cd >= 0) {
 			if (request_irq(host->irq_cd, s3cmci_irq_cd,
 			if (request_irq(host->irq_cd, s3cmci_irq_cd,