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

Commit e2a0a582 authored by Adrian Hunter's avatar Adrian Hunter Committed by Chris Ball
Browse files

mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION 



Even if a driver provides separate card detection, an interrupt
is still needed to abort mmc requests that are in progress.
SDHCI_QUIRK2_OWN_CARD_DETECTION prevents that, so remove it.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent c5e027a4

drivers/mmc/host/sdhci-pci.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,6 @@ static void sdhci_pci_add_own_cd(struct sdhci_pci_slot *slot) 




	slot->cd_gpio = gpio;

	slot->cd_gpio = gpio;

	slot->cd_irq = irq;

	slot->cd_irq = irq;

	slot->host->quirks2 |= SDHCI_QUIRK2_OWN_CARD_DETECTION;





	return;

	return;

drivers/mmc/host/sdhci.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,6 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable) 
	u32 present, irqs;

	u32 present, irqs;





	if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||

	if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||

	    (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION) ||

	    !mmc_card_is_removable(host->mmc))

	    !mmc_card_is_removable(host->mmc))

		return;

		return;

include/linux/mmc/sdhci.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -90,8 +90,6 @@ struct sdhci_host { 




	unsigned int quirks2;	/* More deviations from spec. */

	unsigned int quirks2;	/* More deviations from spec. */





#define SDHCI_QUIRK2_OWN_CARD_DETECTION			(1<<0)



	int irq;		/* Device IRQ */

	int irq;		/* Device IRQ */

	void __iomem *ioaddr;	/* Mapped address */

	void __iomem *ioaddr;	/* Mapped address */