}
        }
 
-       ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
+       ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
                                     phy->provided_clocks);
        if (ret) {
                DRM_DEV_ERROR(dev, "%s: failed to register clk provider: %d\n", __func__, ret);
        return 0;
 
 fail:
-       if (phy->pll) {
-               of_clk_del_provider(dev->of_node);
-               phy->pll = NULL;
-       }
-
        return ret;
 }
 
-static int dsi_phy_driver_remove(struct platform_device *pdev)
-{
-       struct msm_dsi_phy *phy = platform_get_drvdata(pdev);
-
-       if (phy && phy->pll) {
-               of_clk_del_provider(pdev->dev.of_node);
-               phy->pll = NULL;
-       }
-
-       platform_set_drvdata(pdev, NULL);
-
-       return 0;
-}
-
 static struct platform_driver dsi_phy_platform_driver = {
        .probe      = dsi_phy_driver_probe,
-       .remove     = dsi_phy_driver_remove,
        .driver     = {
                .name   = "msm_dsi_phy",
                .of_match_table = dsi_phy_dt_match,