mmc: meson-mx-sdhc: Convert to platform remove callback returning void

[linux-2.6-block.git] / drivers / mmc / host / meson-mx-sdhc-mmc.c

diff --git a/drivers/mmc/host/meson-mx-sdhc-mmc.c b/drivers/mmc/host/meson-mx-sdhc-mmc.c
index 97168cdfa8e982c10ebf332af1533bbb3fe40821..528ec8166e7c3628542ae553b65cc58367d7493d 100644 (file)
--- a/drivers/mmc/host/meson-mx-sdhc-mmc.c
+++ b/drivers/mmc/host/meson-mx-sdhc-mmc.c
@@ -880,7 +880,7 @@ err_disable_pclk:
        return ret;
 }
 
-static int meson_mx_sdhc_remove(struct platform_device *pdev)
+static void meson_mx_sdhc_remove(struct platform_device *pdev)
 {
        struct meson_mx_sdhc_host *host = platform_get_drvdata(pdev);
 
@@ -889,8 +889,6 @@ static int meson_mx_sdhc_remove(struct platform_device *pdev)
        meson_mx_sdhc_disable_clks(host->mmc);
 
        clk_disable_unprepare(host->pclk);
-
-       return 0;
 }
 
 static const struct meson_mx_sdhc_data meson_mx_sdhc_data_meson8 = {
@@ -925,7 +923,7 @@ MODULE_DEVICE_TABLE(of, meson_mx_sdhc_of_match);
 
 static struct platform_driver meson_mx_sdhc_driver = {
        .probe   = meson_mx_sdhc_probe,
-       .remove  = meson_mx_sdhc_remove,
+       .remove_new = meson_mx_sdhc_remove,
        .driver  = {
                .name = "meson-mx-sdhc",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,