diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-06-17 10:17:39 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-07-15 08:14:41 -0400 |
commit | 08f80bb5196517a0dfe50dc7c10f234c0ff2f0e8 (patch) | |
tree | aee5e1808521eb3c00ff37d50a2e8957bebbd34b /drivers/mmc/host/pxamci.c | |
parent | 619ef4b42128709de4d89d209b2c874f560deecd (diff) |
mmc: change .get_ro() callback semantics
Now get_ro() callback must return 0/1 values for its logical states, and
negative errno values in case of error. If particular host instance doesn't
support RO/WP switch, it should return -ENOSYS.
This patch changes some hosts in two ways:
1. Now functions should be smart to not return negative values in
"RO asserted" case (particularly gpio_ calls could return negative
values for the outermost GPIOs).
Also, board code usually passes get_ro() callbacks that directly return
gpioreg & bit result, so at91_mci, imxmmc, pxamci and mmc_spi's get_ro()
handlers need take special care when returning platform's values to the
mmc core.
2. In case of host instance didn't implement get_ro() callback, it should
really return -ENOSYS and let the mmc core decide what to do about it
(mmc core thinks the same way as the hosts, so it isn't functional
change).
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/host/pxamci.c')
-rw-r--r-- | drivers/mmc/host/pxamci.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index d89475d36988..d39f59738866 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -374,9 +374,12 @@ static int pxamci_get_ro(struct mmc_host *mmc) | |||
374 | struct pxamci_host *host = mmc_priv(mmc); | 374 | struct pxamci_host *host = mmc_priv(mmc); |
375 | 375 | ||
376 | if (host->pdata && host->pdata->get_ro) | 376 | if (host->pdata && host->pdata->get_ro) |
377 | return host->pdata->get_ro(mmc_dev(mmc)); | 377 | return !!host->pdata->get_ro(mmc_dev(mmc)); |
378 | /* Host doesn't support read only detection so assume writeable */ | 378 | /* |
379 | return 0; | 379 | * Board doesn't support read only detection; let the mmc core |
380 | * decide what to do. | ||
381 | */ | ||
382 | return -ENOSYS; | ||
380 | } | 383 | } |
381 | 384 | ||
382 | static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | 385 | static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) |