dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

ARM: 6370/1: mmci: use _cansleep GPIO functions

Browse source 
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>
This commit is contained in:
Linus Walleij 2010-09-12 12:56:44 +01:00 committed by Russell King
parent 4b8caec095
commit 18a0630115
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/mmc/host/mmci.c
View file

@ -580,7 +580,7 @@ static int mmci_get_ro(struct mmc_host *mmc)
if (host->gpio_wp == -ENOSYS)
return -ENOSYS;
return gpio_get_value(host->gpio_wp);
return gpio_get_value_cansleep(host->gpio_wp);
}
static int mmci_get_cd(struct mmc_host *mmc)
@ -595,7 +595,8 @@ static int mmci_get_cd(struct mmc_host *mmc)
status = plat->status(mmc_dev(host->mmc));
} else
status = !!gpio_get_value(host->gpio_cd) ^ plat->cd_invert;
status = !!gpio_get_value_cansleep(host->gpio_cd)
^ plat->cd_invert;
/*
* Use positive logic throughout - status is zero for no card,