From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: [PATCH 13/22] drm/msm: Create separate funcs for adding display/gpu components Date: Thu, 16 Jun 2016 17:06:38 +0530 Message-ID: <1466077007-26792-14-git-send-email-architt@codeaurora.org> References: <1466077007-26792-1-git-send-email-architt@codeaurora.org> Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]:35140 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754218AbcFPLiA (ORCPT ); Thu, 16 Jun 2016 07:38:00 -0400 In-Reply-To: <1466077007-26792-1-git-send-email-architt@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: robdclark@gmail.com Cc: robh@kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Archit Taneja Simplifies some of the code that we'll add later. Signed-off-by: Archit Taneja --- drivers/gpu/drm/msm/msm_drv.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index bc2c371..e623dc5 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -832,6 +832,18 @@ static int add_components(struct device *dev, struct component_match **matchptr, return 0; } +static int add_display_components(struct device *dev, + struct component_match **matchptr) +{ + return add_components(&pdev->dev, matchptr, "connectors"); +} + +static int add_gpu_components(struct device *dev, + struct component_match **matchptr) +{ + return add_components(&pdev->dev, matchptr, "gpus"); +} + static int msm_drm_bind(struct device *dev) { return msm_drm_init(dev, &msm_driver); @@ -854,9 +866,15 @@ static const struct component_master_ops msm_drm_ops = { static int msm_pdev_probe(struct platform_device *pdev) { struct component_match *match = NULL; + int ret; + + ret = add_display_components(&pdev->dev, &match); + if (ret) + return ret; - add_components(&pdev->dev, &match, "connectors"); - add_components(&pdev->dev, &match, "gpus"); + ret = add_gpu_components(&pdev->dev, &match); + if (ret) + return ret; pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); return component_master_add_with_match(&pdev->dev, &msm_drm_ops, match); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation