[04/15] drm: msm: use devm_of_platform_populate()

Message ID	1496072763-31209-5-git-send-email-benjamin.gaignard@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Benjamin Gaignard <benjamin.gaignard@linaro.org> Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>, Rob Clark <robdclark@gmail.com>, David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/15] drm: msm: use devm_of_platform_populate() Date: Mon, 29 May 2017 17:45:52 +0200 Message-Id: <1496072763-31209-5-git-send-email-benjamin.gaignard@linaro.org> In-Reply-To: <1496072763-31209-1-git-send-email-benjamin.gaignard@linaro.org> References: <1496072763-31209-1-git-send-email-benjamin.gaignard@linaro.org> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	[01/15] iio: adc: stm32: use devm_of_platform_populate() \| expand [01/15] iio: adc: stm32: use devm_of_platform_populate() [02/15] iio: dac: stm32: use devm_of_platform_populate() [04/15] drm: msm: use devm_of_platform_populate() [05/15] mfd: stm32-timers: use devm_of_platform_populate [06/15] mfd: atmel: use devm_of_platform_populate() [07/15] mfd: cros_ec: use devm_of_platform_populate() [08/15] mfd: exynos: use devm_of_platform_populate() [09/15] mfd: fsl-imx25: use devm_of_platform_populate() [10/15] mfd: motorola-cpcap: use devm_of_platform_populate() [11/15] mfd: palmas: use devm_of_platform_populate() [12/15] mfd: qcom-spmi-pmic: use devm_of_platform_populate() [13/15] mfd: smsc-ece: use devm_of_platform_populate() [14/15] sound: stm32: use devm_of_platform_populate() [15/15] media: exynos4-is: use devm_of_platform_populate()

Message ID

1496072763-31209-5-git-send-email-benjamin.gaignard@linaro.org

State

New

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>,
	Rob Clark <robdclark@gmail.com>,
	David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org,
	dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 04/15] drm: msm: use devm_of_platform_populate()
Date: Mon, 29 May 2017 17:45:52 +0200
Message-Id: <1496072763-31209-5-git-send-email-benjamin.gaignard@linaro.org>
In-Reply-To: <1496072763-31209-1-git-send-email-benjamin.gaignard@linaro.org>
References: <1496072763-31209-1-git-send-email-benjamin.gaignard@linaro.org>
To: unlisted-recipients:; (no To-header on input)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

[01/15] iio: adc: stm32: use devm_of_platform_populate() | expand

Commit Message

Benjamin Gaignard May 29, 2017, 3:45 p.m. UTC

Use devm_of_platform_populate() to simplify driver code.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

CC: Rob Clark <robdclark@gmail.com>
CC: David Airlie <airlied@linux.ie>
CC: linux-arm-msm@vger.kernel.org
CC: dri-devel@lists.freedesktop.org
CC: freedreno@lists.freedesktop.org
CC: linux-kernel@vger.kernel.org
---
 drivers/gpu/drm/msm/msm_drv.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

-- 
1.9.1

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 87b5695..545fb6f 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -969,7 +969,7 @@  static int add_display_components(struct device *dev,
 	 * to our components list.
 	 */
 	if (of_device_is_compatible(dev->of_node, "qcom,mdss")) {
-		ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
+		ret = devm_of_platform_populate(dev);
 		if (ret) {
 			dev_err(dev, "failed to populate children devices\n");
 			return ret;
@@ -978,7 +978,6 @@  static int add_display_components(struct device *dev,
 		mdp_dev = device_find_child(dev, NULL, compare_name_mdp);
 		if (!mdp_dev) {
 			dev_err(dev, "failed to find MDSS MDP node\n");
-			of_platform_depopulate(dev);
 			return -ENODEV;
 		}
 
@@ -992,11 +991,7 @@  static int add_display_components(struct device *dev,
 		mdp_dev = dev;
 	}
 
-	ret = add_components_mdp(mdp_dev, matchptr);
-	if (ret)
-		of_platform_depopulate(dev);
-
-	return ret;
+	return add_components_mdp(mdp_dev, matchptr);
 }
 
 /*
@@ -1072,7 +1067,6 @@  static int msm_pdev_probe(struct platform_device *pdev)
 static int msm_pdev_remove(struct platform_device *pdev)
 {
 	component_master_del(&pdev->dev, &msm_drm_ops);
-	of_platform_depopulate(&pdev->dev);
 
 	return 0;
 }

[04/15] drm: msm: use devm_of_platform_populate()

Commit Message

Patch