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, 4 insertions, 9 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 970314e0aac8..a45ed39d062c 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -158,7 +158,7 @@ static int sdhci_acpi_emmc_probe_slot(struct platform_device *pdev,
158 158
159 host = c->host; 159 host = c->host;
160 160
161 /* Platform specific code during emmc proble slot goes here */ 161 /* Platform specific code during emmc probe slot goes here */
162 162
163 if (hid && uid && !strcmp(hid, "80860F14") && !strcmp(uid, "1") && 163 if (hid && uid && !strcmp(hid, "80860F14") && !strcmp(uid, "1") &&
164 sdhci_readl(host, SDHCI_CAPABILITIES) == 0x446cc8b2 && 164 sdhci_readl(host, SDHCI_CAPABILITIES) == 0x446cc8b2 &&
@@ -179,7 +179,7 @@ static int sdhci_acpi_sdio_probe_slot(struct platform_device *pdev,
179 179
180 host = c->host; 180 host = c->host;
181 181
182 /* Platform specific code during emmc proble slot goes here */ 182 /* Platform specific code during sdio probe slot goes here */
183 183
184 return 0; 184 return 0;
185} 185}
@@ -195,7 +195,7 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
195 195
196 host = c->host; 196 host = c->host;
197 197
198 /* Platform specific code during emmc proble slot goes here */ 198 /* Platform specific code during sd probe slot goes here */
199 199
200 return 0; 200 return 0;
201} 201}
@@ -448,18 +448,13 @@ static int sdhci_acpi_runtime_resume(struct device *dev)
448 return sdhci_runtime_resume_host(c->host); 448 return sdhci_runtime_resume_host(c->host);
449} 449}
450 450
451static int sdhci_acpi_runtime_idle(struct device *dev)
452{
453 return 0;
454}
455
456#endif 451#endif
457 452
458static const struct dev_pm_ops sdhci_acpi_pm_ops = { 453static const struct dev_pm_ops sdhci_acpi_pm_ops = {
459 .suspend = sdhci_acpi_suspend, 454 .suspend = sdhci_acpi_suspend,
460 .resume = sdhci_acpi_resume, 455 .resume = sdhci_acpi_resume,
461 SET_RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend, 456 SET_RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend,
462 sdhci_acpi_runtime_resume, sdhci_acpi_runtime_idle) 457 sdhci_acpi_runtime_resume, NULL)
463}; 458};
464 459
465static struct platform_driver sdhci_acpi_driver = { 460static struct platform_driver sdhci_acpi_driver = {