diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2014-10-06 15:23:06 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-10-06 15:08:14 +0200 |
| commit | 7dafca835a459ab31792d9def69ed30cf6dc08ab (patch) | |
| tree | 2cf2f2d40751e31bfc30300fc77679e35acacbe1 | |
| parent | 3db3525196a992da628fb210776d73ec4bb59460 (diff) | |
| download | linux-stable-7dafca835a459ab31792d9def69ed30cf6dc08ab.tar.gz linux-stable-7dafca835a459ab31792d9def69ed30cf6dc08ab.tar.bz2 linux-stable-7dafca835a459ab31792d9def69ed30cf6dc08ab.zip | |
mmc: sdhci-acpi: Pass HID and UID to probe_slot
Pass HID and UID to probe_slot so extra setup
can be done for specific ids.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/mmc/host/sdhci-acpi.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index 839f26cdc901..7548261221b5 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -67,7 +67,7 @@ struct sdhci_acpi_slot { unsigned int caps2; mmc_pm_flag_t pm_caps; unsigned int flags; - int (*probe_slot)(struct platform_device *); + int (*probe_slot)(struct platform_device *, const char *, const char *); int (*remove_slot)(struct platform_device *); }; @@ -124,7 +124,8 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = { .ops = &sdhci_acpi_ops_int, }; -static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev) +static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev, + const char *hid, const char *uid) { struct sdhci_acpi_host *c = platform_get_drvdata(pdev); struct sdhci_host *host; @@ -139,7 +140,8 @@ static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev) return 0; } -static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev) +static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev, + const char *hid, const char *uid) { struct sdhci_acpi_host *c = platform_get_drvdata(pdev); struct sdhci_host *host; @@ -154,7 +156,8 @@ static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev) return 0; } -static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev) +static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev, + const char *hid, const char *uid) { struct sdhci_acpi_host *c = platform_get_drvdata(pdev); struct sdhci_host *host; @@ -314,7 +317,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev) if (c->slot) { if (c->slot->probe_slot) { - err = c->slot->probe_slot(pdev); + err = c->slot->probe_slot(pdev, hid, uid); if (err) goto err_free; } |