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

Commit 6ac9b837 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: Remove unused member cd_con_id 



cd_con_id is not used and always NULL.
Remove it to make code a bit more cleaner.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3bc702ed

drivers/mmc/host/sdhci-pci-core.c

+1 −2
Original line number Diff line number Diff line
@@ -424,7 +424,6 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot) 
static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)

{

	slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;

	slot->cd_con_id = NULL;

	slot->cd_idx = 0;

	slot->cd_override_level = true;

	if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
@@ -1817,7 +1816,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( 
	host->mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP;



	if (slot->cd_idx >= 0) {

		ret = mmc_gpiod_request_cd(host->mmc, slot->cd_con_id, slot->cd_idx,

		ret = mmc_gpiod_request_cd(host->mmc, NULL, slot->cd_idx,

					   slot->cd_override_level, 0, NULL);

		if (ret == -EPROBE_DEFER)

			goto remove;

drivers/mmc/host/sdhci-pci.h

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ struct sdhci_pci_slot { 
	int			cd_gpio;

	int			cd_irq;



	char			*cd_con_id;

	int			cd_idx;

	bool			cd_override_level;