|
@@ -316,7 +316,6 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
|
|
err_add_host:
|
|
err_add_host:
|
|
clk_disable_unprepare(clk);
|
|
clk_disable_unprepare(clk);
|
|
clk_put(clk);
|
|
clk_put(clk);
|
|
- mmc_gpio_free_cd(host->mmc);
|
|
|
|
err_cd_req:
|
|
err_cd_req:
|
|
err_clk_get:
|
|
err_clk_get:
|
|
sdhci_pltfm_free(pdev);
|
|
sdhci_pltfm_free(pdev);
|
|
@@ -329,16 +328,12 @@ static int sdhci_pxav3_remove(struct platform_device *pdev)
|
|
struct sdhci_host *host = platform_get_drvdata(pdev);
|
|
struct sdhci_host *host = platform_get_drvdata(pdev);
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_pxa *pxa = pltfm_host->priv;
|
|
struct sdhci_pxa *pxa = pltfm_host->priv;
|
|
- struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
|
|
|
|
|
|
|
|
sdhci_remove_host(host, 1);
|
|
sdhci_remove_host(host, 1);
|
|
|
|
|
|
clk_disable_unprepare(pltfm_host->clk);
|
|
clk_disable_unprepare(pltfm_host->clk);
|
|
clk_put(pltfm_host->clk);
|
|
clk_put(pltfm_host->clk);
|
|
|
|
|
|
- if (gpio_is_valid(pdata->ext_cd_gpio))
|
|
|
|
- mmc_gpio_free_cd(host->mmc);
|
|
|
|
-
|
|
|
|
sdhci_pltfm_free(pdev);
|
|
sdhci_pltfm_free(pdev);
|
|
kfree(pxa);
|
|
kfree(pxa);
|
|
|
|
|