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/mmc_spi.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/mmc_spi.c')
-rw-r--r-- | drivers/mmc/host/mmc_spi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 547eb857b1b3..4e82f64a96bc 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c | |||
@@ -1126,9 +1126,12 @@ static int mmc_spi_get_ro(struct mmc_host *mmc) | |||
1126 | struct mmc_spi_host *host = mmc_priv(mmc); | 1126 | struct mmc_spi_host *host = mmc_priv(mmc); |
1127 | 1127 | ||
1128 | if (host->pdata && host->pdata->get_ro) | 1128 | if (host->pdata && host->pdata->get_ro) |
1129 | return host->pdata->get_ro(mmc->parent); | 1129 | return !!host->pdata->get_ro(mmc->parent); |
1130 | /* board doesn't support read only detection; assume writeable */ | 1130 | /* |
1131 | return 0; | 1131 | * Board doesn't support read only detection; let the mmc core |
1132 | * decide what to do. | ||
1133 | */ | ||
1134 | return -ENOSYS; | ||
1132 | } | 1135 | } |
1133 | 1136 | ||
1134 | static int mmc_spi_get_cd(struct mmc_host *mmc) | 1137 | static int mmc_spi_get_cd(struct mmc_host *mmc) |