Merge tag 'phy-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy

[sfrench/cifs-2.6.git] / drivers / phy / intel / phy-intel-lgm-combo.c

diff --git a/drivers/phy/intel/phy-intel-lgm-combo.c b/drivers/phy/intel/phy-intel-lgm-combo.c
index 8c764c457c1c4a653f524c38c8b84f904be9dd1f..d32e267c0001d8a6ea47c8da522e1c11076b193e 100644 (file)
--- a/drivers/phy/intel/phy-intel-lgm-combo.c
+++ b/drivers/phy/intel/phy-intel-lgm-combo.c
@@ -589,13 +589,12 @@ static int intel_cbphy_probe(struct platform_device *pdev)
        return intel_cbphy_create(cbphy);
 }
 
-static int intel_cbphy_remove(struct platform_device *pdev)
+static void intel_cbphy_remove(struct platform_device *pdev)
 {
        struct intel_combo_phy *cbphy = platform_get_drvdata(pdev);
 
        intel_cbphy_rst_assert(cbphy);
        clk_disable_unprepare(cbphy->core_clk);
-       return 0;
 }
 
 static const struct of_device_id of_intel_cbphy_match[] = {
@@ -606,7 +605,7 @@ static const struct of_device_id of_intel_cbphy_match[] = {
 
 static struct platform_driver intel_cbphy_driver = {
        .probe = intel_cbphy_probe,
-       .remove = intel_cbphy_remove,
+       .remove_new = intel_cbphy_remove,
        .driver = {
                .name = "intel-combo-phy",
                .of_match_table = of_intel_cbphy_match,