Skip to content

Commit

Permalink
ARM: 6370/1: mmci: use _cansleep GPIO functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Walleij authored and Russell King committed Sep 23, 2010
1 parent 4b8caec commit 18a0630
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/mmc/host/mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
Expand Down

0 comments on commit 18a0630

Please sign in to comment.