[v1,2/2] drm: sti: make driver use devm_of_platform_populate()

Message ID 1487341886-13829-3-git-send-email-benjamin.gaignard@linaro.org
State Superseded
Headers show
Series
  • [v1,1/2] of: add devm_ functions for populate and depopulate
Related show

Commit Message

Benjamin Gaignard Feb. 17, 2017, 2:31 p.m.
This make sure that of_platform_depopulate() is called if an error
occur in probe after populating the date from the device tree.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
 drivers/gpu/drm/sti/sti_drv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
index ff71e25..01ef9a4 100644
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_drv.c
@@ -438,7 +438,7 @@  static int sti_platform_probe(struct platform_device *pdev)
 
 	dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
 
-	of_platform_populate(node, NULL, NULL, dev);
+	devm_of_platform_populate(dev, node, NULL, NULL, dev);
 
 	child_np = of_get_next_available_child(node, NULL);
 
@@ -454,7 +454,6 @@  static int sti_platform_probe(struct platform_device *pdev)
 static int sti_platform_remove(struct platform_device *pdev)
 {
 	component_master_del(&pdev->dev, &sti_ops);
-	of_platform_depopulate(&pdev->dev);
 
 	return 0;
 }