aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci-acpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc/host/sdhci-acpi.c')
-rw-r--r--drivers/mmc/host/sdhci-acpi.c13
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 {
67 unsigned int caps2; 67 unsigned int caps2;
68 mmc_pm_flag_t pm_caps; 68 mmc_pm_flag_t pm_caps;
69 unsigned int flags; 69 unsigned int flags;
70 int (*probe_slot)(struct platform_device *); 70 int (*probe_slot)(struct platform_device *, const char *, const char *);
71 int (*remove_slot)(struct platform_device *); 71 int (*remove_slot)(struct platform_device *);
72}; 72};
73 73
@@ -124,7 +124,8 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = {
124 .ops = &sdhci_acpi_ops_int, 124 .ops = &sdhci_acpi_ops_int,
125}; 125};
126 126
127static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev) 127static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev,
128 const char *hid, const char *uid)
128{ 129{
129 struct sdhci_acpi_host *c = platform_get_drvdata(pdev); 130 struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
130 struct sdhci_host *host; 131 struct sdhci_host *host;
@@ -139,7 +140,8 @@ static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev)
139 return 0; 140 return 0;
140} 141}
141 142
142static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev) 143static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev,
144 const char *hid, const char *uid)
143{ 145{
144 struct sdhci_acpi_host *c = platform_get_drvdata(pdev); 146 struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
145 struct sdhci_host *host; 147 struct sdhci_host *host;
@@ -154,7 +156,8 @@ static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev)
154 return 0; 156 return 0;
155} 157}
156 158
157static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev) 159static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
160 const char *hid, const char *uid)
158{ 161{
159 struct sdhci_acpi_host *c = platform_get_drvdata(pdev); 162 struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
160 struct sdhci_host *host; 163 struct sdhci_host *host;
@@ -314,7 +317,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
314 317
315 if (c->slot) { 318 if (c->slot) {
316 if (c->slot->probe_slot) { 319 if (c->slot->probe_slot) {
317 err = c->slot->probe_slot(pdev); 320 err = c->slot->probe_slot(pdev, hid, uid);
318 if (err) 321 if (err)
319 goto err_free; 322 goto err_free;
320 } 323 }