Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a06301 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

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: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4b8caec0

drivers/mmc/host/mmci.c

+3 −2
Original line number Diff line number Diff line
@@ -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,