From 9740522c793bb49a67b19ce89eff55d5cefe0150 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 14 Dec 2009 18:01:27 -0800 Subject: [PATCH] --- yaml --- r: 176396 b: refs/heads/master c: c78402e95dd8238ee2b0e6e62b9a0c8b2bb9bba9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/s3cmci.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 08aa6bc99143..77e2b70272e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7a6186c4b96d4ce5c1d13d91b7f862b0adc0e72 +refs/heads/master: c78402e95dd8238ee2b0e6e62b9a0c8b2bb9bba9 diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c index b4db401874e0..d96e1abf2d64 100644 --- a/trunk/drivers/mmc/host/s3cmci.c +++ b/trunk/drivers/mmc/host/s3cmci.c @@ -1303,10 +1303,8 @@ static int s3cmci_get_ro(struct mmc_host *mmc) 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; } @@ -1655,7 +1653,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev) 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,