aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/at91_mci.c
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2008-06-17 10:17:39 -0400
committerPierre Ossman <drzeus@drzeus.cx>2008-07-15 08:14:41 -0400
commit08f80bb5196517a0dfe50dc7c10f234c0ff2f0e8 (patch)
treeaee5e1808521eb3c00ff37d50a2e8957bebbd34b /drivers/mmc/host/at91_mci.c
parent619ef4b42128709de4d89d209b2c874f560deecd (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/at91_mci.c')
-rw-r--r--drivers/mmc/host/at91_mci.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 8979ad330a4d..b9d4ed6b29b1 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -793,19 +793,15 @@ static irqreturn_t at91_mmc_det_irq(int irq, void *_host)
793 793
794static int at91_mci_get_ro(struct mmc_host *mmc) 794static int at91_mci_get_ro(struct mmc_host *mmc)
795{ 795{
796 int read_only = 0;
797 struct at91mci_host *host = mmc_priv(mmc); 796 struct at91mci_host *host = mmc_priv(mmc);
798 797
799 if (host->board->wp_pin) { 798 if (host->board->wp_pin)
800 read_only = gpio_get_value(host->board->wp_pin); 799 return !!gpio_get_value(host->board->wp_pin);
801 printk(KERN_WARNING "%s: card is %s\n", mmc_hostname(mmc), 800 /*
802 (read_only ? "read-only" : "read-write") ); 801 * Board doesn't support read only detection; let the mmc core
803 } 802 * decide what to do.
804 else { 803 */
805 printk(KERN_WARNING "%s: host does not support reading read-only " 804 return -ENOSYS;
806 "switch. Assuming write-enable.\n", mmc_hostname(mmc));
807 }
808 return read_only;
809} 805}
810 806
811static const struct mmc_host_ops at91_mci_ops = { 807static const struct mmc_host_ops at91_mci_ops = {