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

Commit 5f3a8601 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

mmc: slot-gpio: call gpiod_to_irq() only when MMC_CAP_NEEDS_POLL is unset 



It is not efficient to call gpiod_to_irq() regardless the flag, then
ignore the returned irq if MMC_CAP_NEEDS_POLL.

Move gpiod_to_irq() after the MMC_CAP_NEEDS_POLL check.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 50c4c4e2

drivers/mmc/core/slot-gpio.c

+6 −8
Original line number Diff line number Diff line
@@ -121,20 +121,18 @@ EXPORT_SYMBOL(mmc_gpio_request_ro); 
void mmc_gpiod_request_cd_irq(struct mmc_host *host)

{

	struct mmc_gpio *ctx = host->slot.handler_priv;

	int ret, irq;

	int irq = -EINVAL;

	int ret;



	if (host->slot.cd_irq >= 0 || !ctx || !ctx->cd_gpio)

		return;



	irq = gpiod_to_irq(ctx->cd_gpio);



	/*

	 * Even if gpiod_to_irq() returns a valid IRQ number, the platform might

	 * still prefer to poll, e.g., because that IRQ number is already used

	 * by another unit and cannot be shared.

	 * Do not use IRQ if the platform prefers to poll, e.g., because that

	 * IRQ number is already used by another unit and cannot be shared.

	 */

	if (irq >= 0 && host->caps & MMC_CAP_NEEDS_POLL)

		irq = -EINVAL;

	if (!(host->caps & MMC_CAP_NEEDS_POLL))

		irq = gpiod_to_irq(ctx->cd_gpio);



	if (irq >= 0) {

		if (!ctx->cd_gpio_isr)