Merge tag 'parisc-for-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/delle...

[platform/kernel/linux-starfive.git] / drivers / mmc / host / sdhci-spear.c

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index c790357..c81bdfa 100644 (file)
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -117,7 +117,7 @@ err:
        return ret;
 }
 
-static int sdhci_remove(struct platform_device *pdev)
+static void sdhci_remove(struct platform_device *pdev)
 {
        struct sdhci_host *host = platform_get_drvdata(pdev);
        struct spear_sdhci *sdhci = sdhci_priv(host);
@@ -131,8 +131,6 @@ static int sdhci_remove(struct platform_device *pdev)
        sdhci_remove_host(host, dead);
        clk_disable_unprepare(sdhci->clk);
        sdhci_free_host(host);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -170,23 +168,21 @@ static int sdhci_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(sdhci_pm_ops, sdhci_suspend, sdhci_resume);
 
-#ifdef CONFIG_OF
 static const struct of_device_id sdhci_spear_id_table[] = {
        { .compatible = "st,spear300-sdhci" },
        {}
 };
 MODULE_DEVICE_TABLE(of, sdhci_spear_id_table);
-#endif
 
 static struct platform_driver sdhci_driver = {
        .driver = {
                .name   = "sdhci",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &sdhci_pm_ops,
-               .of_match_table = of_match_ptr(sdhci_spear_id_table),
+               .of_match_table = sdhci_spear_id_table,
        },
        .probe          = sdhci_probe,
-       .remove         = sdhci_remove,
+       .remove_new     = sdhci_remove,
 };
 
 module_platform_driver(sdhci_driver);