Skip to content

Commit e4e8b1f

Browse files
glneoJassi Brar
authored andcommitted
mailbox: omap: Use devm_pm_runtime_enable() helper
Use device life-cycle managed runtime enable function to simplify probe and exit paths. Signed-off-by: Andrew Davis <[email protected]> Signed-off-by: Jassi Brar <[email protected]>
1 parent 982b145 commit e4e8b1f

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

drivers/mailbox/omap-mailbox.c

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -726,11 +726,11 @@ static int omap_mbox_probe(struct platform_device *pdev)
726726
return ret;
727727

728728
platform_set_drvdata(pdev, mdev);
729-
pm_runtime_enable(mdev->dev);
729+
devm_pm_runtime_enable(mdev->dev);
730730

731731
ret = pm_runtime_resume_and_get(mdev->dev);
732732
if (ret < 0)
733-
goto unregister;
733+
return ret;
734734

735735
/*
736736
* just print the raw revision register, the format is not
@@ -741,26 +741,14 @@ static int omap_mbox_probe(struct platform_device *pdev)
741741

742742
ret = pm_runtime_put_sync(mdev->dev);
743743
if (ret < 0 && ret != -ENOSYS)
744-
goto unregister;
744+
return ret;
745745

746746
devm_kfree(&pdev->dev, finfoblk);
747747
return 0;
748-
749-
unregister:
750-
pm_runtime_disable(mdev->dev);
751-
return ret;
752-
}
753-
754-
static void omap_mbox_remove(struct platform_device *pdev)
755-
{
756-
struct omap_mbox_device *mdev = platform_get_drvdata(pdev);
757-
758-
pm_runtime_disable(mdev->dev);
759748
}
760749

761750
static struct platform_driver omap_mbox_driver = {
762751
.probe = omap_mbox_probe,
763-
.remove_new = omap_mbox_remove,
764752
.driver = {
765753
.name = "omap-mailbox",
766754
.pm = &omap_mbox_pm_ops,

0 commit comments

Comments
 (0)