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

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
...@@ -424,7 +424,6 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot) ...@@ -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) static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
{ {
slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY; slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
slot->cd_con_id = NULL;
slot->cd_idx = 0; slot->cd_idx = 0;
slot->cd_override_level = true; slot->cd_override_level = true;
if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD || if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
...@@ -1817,7 +1816,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( ...@@ -1817,7 +1816,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
host->mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP; host->mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP;
if (slot->cd_idx >= 0) { 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); slot->cd_override_level, 0, NULL);
if (ret == -EPROBE_DEFER) if (ret == -EPROBE_DEFER)
goto remove; goto remove;
......
...@@ -81,7 +81,6 @@ struct sdhci_pci_slot { ...@@ -81,7 +81,6 @@ struct sdhci_pci_slot {
int cd_gpio; int cd_gpio;
int cd_irq; int cd_irq;
char *cd_con_id;
int cd_idx; int cd_idx;
bool cd_override_level; bool cd_override_level;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment