提交 7dafca83 编写于 作者: A Adrian Hunter 提交者: Ulf Hansson

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: NAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>
上级 3db35251
...@@ -67,7 +67,7 @@ struct sdhci_acpi_slot { ...@@ -67,7 +67,7 @@ struct sdhci_acpi_slot {
unsigned int caps2; unsigned int caps2;
mmc_pm_flag_t pm_caps; mmc_pm_flag_t pm_caps;
unsigned int flags; 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 *); int (*remove_slot)(struct platform_device *);
}; };
...@@ -124,7 +124,8 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = { ...@@ -124,7 +124,8 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = {
.ops = &sdhci_acpi_ops_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_acpi_host *c = platform_get_drvdata(pdev);
struct sdhci_host *host; struct sdhci_host *host;
...@@ -139,7 +140,8 @@ static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev) ...@@ -139,7 +140,8 @@ static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev)
return 0; 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_acpi_host *c = platform_get_drvdata(pdev);
struct sdhci_host *host; struct sdhci_host *host;
...@@ -154,7 +156,8 @@ static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev) ...@@ -154,7 +156,8 @@ static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev)
return 0; 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_acpi_host *c = platform_get_drvdata(pdev);
struct sdhci_host *host; struct sdhci_host *host;
...@@ -314,7 +317,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev) ...@@ -314,7 +317,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
if (c->slot) { if (c->slot) {
if (c->slot->probe_slot) { if (c->slot->probe_slot) {
err = c->slot->probe_slot(pdev); err = c->slot->probe_slot(pdev, hid, uid);
if (err) if (err)
goto err_free; goto err_free;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册