diff options
Diffstat (limited to 'drivers/mmc/host/sdhci-spear.c')
-rw-r--r-- | drivers/mmc/host/sdhci-spear.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c index 87a700944b7..c6ece0bd03b 100644 --- a/drivers/mmc/host/sdhci-spear.c +++ b/drivers/mmc/host/sdhci-spear.c | |||
@@ -71,8 +71,7 @@ static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | #ifdef CONFIG_OF | 73 | #ifdef CONFIG_OF |
74 | static struct sdhci_plat_data * __devinit | 74 | static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pdev) |
75 | sdhci_probe_config_dt(struct platform_device *pdev) | ||
76 | { | 75 | { |
77 | struct device_node *np = pdev->dev.of_node; | 76 | struct device_node *np = pdev->dev.of_node; |
78 | struct sdhci_plat_data *pdata = NULL; | 77 | struct sdhci_plat_data *pdata = NULL; |
@@ -96,14 +95,13 @@ sdhci_probe_config_dt(struct platform_device *pdev) | |||
96 | return pdata; | 95 | return pdata; |
97 | } | 96 | } |
98 | #else | 97 | #else |
99 | static struct sdhci_plat_data * __devinit | 98 | static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pdev) |
100 | sdhci_probe_config_dt(struct platform_device *pdev) | ||
101 | { | 99 | { |
102 | return ERR_PTR(-ENOSYS); | 100 | return ERR_PTR(-ENOSYS); |
103 | } | 101 | } |
104 | #endif | 102 | #endif |
105 | 103 | ||
106 | static int __devinit sdhci_probe(struct platform_device *pdev) | 104 | static int sdhci_probe(struct platform_device *pdev) |
107 | { | 105 | { |
108 | struct device_node *np = pdev->dev.of_node; | 106 | struct device_node *np = pdev->dev.of_node; |
109 | struct sdhci_host *host; | 107 | struct sdhci_host *host; |
@@ -273,7 +271,7 @@ err: | |||
273 | return ret; | 271 | return ret; |
274 | } | 272 | } |
275 | 273 | ||
276 | static int __devexit sdhci_remove(struct platform_device *pdev) | 274 | static int sdhci_remove(struct platform_device *pdev) |
277 | { | 275 | { |
278 | struct sdhci_host *host = platform_get_drvdata(pdev); | 276 | struct sdhci_host *host = platform_get_drvdata(pdev); |
279 | struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev); | 277 | struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev); |
@@ -341,7 +339,7 @@ static struct platform_driver sdhci_driver = { | |||
341 | .of_match_table = of_match_ptr(sdhci_spear_id_table), | 339 | .of_match_table = of_match_ptr(sdhci_spear_id_table), |
342 | }, | 340 | }, |
343 | .probe = sdhci_probe, | 341 | .probe = sdhci_probe, |
344 | .remove = __devexit_p(sdhci_remove), | 342 | .remove = sdhci_remove, |
345 | }; | 343 | }; |
346 | 344 | ||
347 | module_platform_driver(sdhci_driver); | 345 | module_platform_driver(sdhci_driver); |