From: Ben Dooks <ben@simtec.co.uk>
To: akpm@linux-foundation.org, linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
Simtec Linux Team <linux@simtec.co.uk>
Subject: s3cmci: convert missed s3c2410_gpio calls to gpiolib calls
Date: Tue, 10 Nov 2009 17:15:50 +0000 [thread overview]
Message-ID: <20091110171550.185534014@fluff.org.uk> (raw)
[-- 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'
reply other threads:[~2009-11-10 17:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091110171550.185534014@fluff.org.uk \
--to=ben@simtec.co.uk \
--cc=akpm@linux-foundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux@simtec.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox