diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2010-09-12 07:56:44 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-23 10:02:28 -0400 |
commit | 18a06301158b5e4e9fae29e477f468e23f3eda90 (patch) | |
tree | db4c418a505bffe3b1e4f1981725ea5748a188e7 /drivers/mmc | |
parent | 4b8caec09562ce7e6e3aaf2954eef8ea73ba67b8 (diff) |
ARM: 6370/1: mmci: use _cansleep GPIO functions
Currently the kernel is screaming about slowpath at me for the
wp/cd callbacks. Switch to the _cansleep variants so as to silence
this.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/mmci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index fd89d9230928..f2e02d7d9f3d 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
@@ -580,7 +580,7 @@ static int mmci_get_ro(struct mmc_host *mmc) | |||
580 | if (host->gpio_wp == -ENOSYS) | 580 | if (host->gpio_wp == -ENOSYS) |
581 | return -ENOSYS; | 581 | return -ENOSYS; |
582 | 582 | ||
583 | return gpio_get_value(host->gpio_wp); | 583 | return gpio_get_value_cansleep(host->gpio_wp); |
584 | } | 584 | } |
585 | 585 | ||
586 | static int mmci_get_cd(struct mmc_host *mmc) | 586 | static int mmci_get_cd(struct mmc_host *mmc) |
@@ -595,7 +595,8 @@ static int mmci_get_cd(struct mmc_host *mmc) | |||
595 | 595 | ||
596 | status = plat->status(mmc_dev(host->mmc)); | 596 | status = plat->status(mmc_dev(host->mmc)); |
597 | } else | 597 | } else |
598 | status = !!gpio_get_value(host->gpio_cd) ^ plat->cd_invert; | 598 | status = !!gpio_get_value_cansleep(host->gpio_cd) |
599 | ^ plat->cd_invert; | ||
599 | 600 | ||
600 | /* | 601 | /* |
601 | * Use positive logic throughout - status is zero for no card, | 602 | * Use positive logic throughout - status is zero for no card, |