bus: ti-sysc: Fix unbalanced pm_runtime_enable by adding remove
authorTony Lindgren <tony@atomide.com>
Fri, 13 Oct 2017 17:48:40 +0000 (10:48 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 13 Oct 2017 17:48:40 +0000 (10:48 -0700)
Looks like we're missing remove() that's needed if a driver instance
rebound. Otherwise we will get "Unbalanced pm_runtime_enable!".

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/bus/ti-sysc.c

index 8b95d0f0c319976127c7560960f2ea07249c8f08..c3c76a1ea8a84f8fe6d27547833a0b8cde62f90c 100644 (file)
@@ -529,6 +529,30 @@ unprepare:
        return error;
 }
 
+static int sysc_remove(struct platform_device *pdev)
+{
+       struct sysc *ddata = platform_get_drvdata(pdev);
+       int error;
+
+       error = pm_runtime_get_sync(ddata->dev);
+       if (error < 0) {
+               pm_runtime_put_noidle(ddata->dev);
+               pm_runtime_disable(ddata->dev);
+               goto unprepare;
+       }
+
+       of_platform_depopulate(&pdev->dev);
+
+       pm_runtime_dont_use_autosuspend(&pdev->dev);
+       pm_runtime_put_sync(&pdev->dev);
+       pm_runtime_disable(&pdev->dev);
+
+unprepare:
+       sysc_unprepare(ddata);
+
+       return 0;
+}
+
 static const struct of_device_id sysc_match[] = {
        { .compatible = "ti,sysc-omap2" },
        { .compatible = "ti,sysc-omap4" },
@@ -546,6 +570,7 @@ MODULE_DEVICE_TABLE(of, sysc_match);
 
 static struct platform_driver sysc_driver = {
        .probe          = sysc_probe,
+       .remove         = sysc_remove,
        .driver         = {
                .name   = "ti-sysc",
                .of_match_table = sysc_match,