From patchwork Mon May 29 15:45:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 9753419 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1BE7F6038E for ; Mon, 29 May 2017 15:48:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EBBF237A5 for ; Mon, 29 May 2017 15:48:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0188427FB6; Mon, 29 May 2017 15:48:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C45A237A5 for ; Mon, 29 May 2017 15:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751187AbdE2PsS (ORCPT ); Mon, 29 May 2017 11:48:18 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:38326 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbdE2Pql (ORCPT ); Mon, 29 May 2017 11:46:41 -0400 Received: by mail-wm0-f49.google.com with SMTP id e127so65979415wmg.1 for ; Mon, 29 May 2017 08:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K/uWNx3F/MXl+yvFxtAp8QUqo6J8cCy6nXjOC0BY+KA=; b=MK0h+2cktcPRlEkdFf0dak2fiTFGAyc/5BtIlEqUftzWNCzqNuiRe6GnhUg74L2m1S uRriaE6NvIgD7DhYnBkNoJnFyQjbWu7mZpWS/qE71JdIEEL5EsVnfD+cRRTvV5/md8iw wf1pFVC6+gGTPHUXm5pnSqfy0BQH1tOVNnNx0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K/uWNx3F/MXl+yvFxtAp8QUqo6J8cCy6nXjOC0BY+KA=; b=btwa7PhPZT37vV1/CsIVYyY7gbw38tYtSXYJb6QvsQ25XK1zd7wmYduHaHLCj9Oz60 KJA5reDRvYmqBtboppcV7b7axY3LULnRICZ2uZM7heIRtBoo0400tHxEesby9KpnVyy5 ruTM1pQZSSQEuGOKSXYRYR0E8DnOXOqBaT3mmgLSZt8faXUB+JNXoADVQKFvHI86W1R1 ETAbAq1N18FCDjCoBVoQhjg6qFQul5EMUt/uGIdfMR1v3YGbPGe7MT5nb8XEamOT03OT 4dgRxWesTAKeuvBebMc4qs18kQRVDfCibHwvoVStCocB1Kn8ONALtRT9qwL5igF39uX8 nvSQ== X-Gm-Message-State: AODbwcCA7kY0IyjP4Wq7V80fqvtfkF7rpEx15pGJQ+K0Ql8ROmdEA1GG 4/dEqYqqaKJYT2yo X-Received: by 10.223.134.22 with SMTP id 22mr10224155wrv.182.1496072790587; Mon, 29 May 2017 08:46:30 -0700 (PDT) Received: from lmenx321.st.com. ([80.215.227.188]) by smtp.gmail.com with ESMTPSA id 79sm13210721wmo.13.2017.05.29.08.46.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 May 2017 08:46:30 -0700 (PDT) From: Benjamin Gaignard Cc: Benjamin Gaignard , Rob Clark , David Airlie , 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> X-Mailer: git-send-email 1.9.1 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-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use devm_of_platform_populate() to simplify driver code. Signed-off-by: Benjamin Gaignard CC: Rob Clark CC: David Airlie 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(-) 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; }