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

Commit 11227d12 authored by Andreas Fenkart's avatar Andreas Fenkart Committed by Ulf Hansson
Browse files

mmc: omap_hsmmc: simplify card/cover detect isr 



strip the card dectet logic from cover detect isr and vice versa
the generic mmc_gpio_cd_irqt isr, uses 200ms on removal/insertion,
hence that should be fine here as well

Signed-off-by: default avatarAndreas Fenkart <afenkart@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b793f658

drivers/mmc/host/omap_hsmmc.c

+3 −24
Original line number Diff line number Diff line
@@ -1241,21 +1241,11 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host *host) 
static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id)

{

	struct omap_hsmmc_host *host = dev_id;

	int carddetect;



	sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch");



	if (host->card_detect) {

		carddetect = host->card_detect(host->dev);

	} else {

	omap_hsmmc_protect_card(host);

		carddetect = -ENOSYS;

	}



	if (carddetect)

	mmc_detect_change(host->mmc, (HZ * 200) / 1000);

	else

		mmc_detect_change(host->mmc, (HZ * 50) / 1000);

	return IRQ_HANDLED;

}
@@ -1265,19 +1255,8 @@ static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id) 
static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id)

{

	struct omap_hsmmc_host *host = dev_id;

	int carddetect;



	if (host->card_detect)

		carddetect = host->card_detect(host->dev);

	else {

		omap_hsmmc_protect_card(host);

		carddetect = -ENOSYS;

	}



	if (carddetect)

	mmc_detect_change(host->mmc, (HZ * 200) / 1000);

	else

		mmc_detect_change(host->mmc, (HZ * 50) / 1000);

	return IRQ_HANDLED;

}