From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752663AbcF2GoM (ORCPT ); Wed, 29 Jun 2016 02:44:12 -0400 Received: from lucky1.263xmail.com ([211.157.147.130]:38464 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752622AbcF2GoI (ORCPT ); Wed, 29 Jun 2016 02:44:08 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: dan.carpenter@oracle.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v3 06/10] drm/rockchip: analogix_dp: make panel detect to an optional action To: Sean Paul References: <1465904718-663-1-git-send-email-ykk@rock-chips.com> <1465904784-978-1-git-send-email-ykk@rock-chips.com> Cc: Mark Yao , Inki Dae , Jingoo Han , Heiko Stuebner , Krzysztof Kozlowski , linux-samsung-soc , linux-rockchip@lists.infradead.org, Daniel Vetter , Emil Velikov , Douglas Anderson , dri-devel , Linux Kernel Mailing List , Javier Martinez Canillas , Tomasz Figa , =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Thierry Reding , Dan Carpenter From: Yakir Yang Message-ID: <57736E19.7090900@rock-chips.com> Date: Wed, 29 Jun 2016 14:43:37 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean, On 06/23/2016 10:10 PM, Sean Paul wrote: > On Tue, Jun 14, 2016 at 7:46 AM, Yakir Yang wrote: >> Some boards don't need to declare a panel device node, like the >> display interface is DP monitors, so it's necessary to make the >> panel detect to an optional action. >> >> Signed-off-by: Yakir Yang >> Acked-by: Mark Yao >> --- >> Changes in v3: >> - Add the acked flag from Mark. >> >> Changes in v2: None >> >> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 48 ++++++++++++------------- >> 1 file changed, 22 insertions(+), 26 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> index bcd9ecc..da2e844 100644 >> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> @@ -332,38 +332,34 @@ static int rockchip_dp_probe(struct platform_device *pdev) >> { >> struct device *dev = &pdev->dev; >> struct device_node *panel_node, *port, *endpoint; >> + struct drm_panel *panel = NULL; >> struct rockchip_dp_device *dp; >> - struct drm_panel *panel; >> >> port = of_graph_get_port_by_id(dev->of_node, 1); >> - if (!port) { >> - dev_err(dev, "can't find output port\n"); >> - return -EINVAL; >> - } >> - >> - endpoint = of_get_child_by_name(port, "endpoint"); >> - of_node_put(port); >> - if (!endpoint) { >> - dev_err(dev, "no output endpoint found\n"); >> - return -EINVAL; >> - } >> - >> - panel_node = of_graph_get_remote_port_parent(endpoint); >> - of_node_put(endpoint); >> - if (!panel_node) { >> - dev_err(dev, "no output node found\n"); >> - return -EINVAL; >> - } >> - >> - panel = of_drm_find_panel(panel_node); >> - if (!panel) { >> - DRM_ERROR("failed to find panel\n"); >> + if (port) { >> + endpoint = of_get_child_by_name(port, "endpoint"); >> + of_node_put(port); >> + if (!endpoint) { >> + dev_err(dev, "no output endpoint found\n"); >> + return -EINVAL; >> + } >> + >> + panel_node = of_graph_get_remote_port_parent(endpoint); >> + of_node_put(endpoint); >> + if (!panel_node) { >> + dev_err(dev, "no output node found\n"); >> + return -EINVAL; >> + } >> + >> + panel = of_drm_find_panel(panel_node); >> + if (!panel) { >> + DRM_ERROR("failed to find panel\n"); >> + of_node_put(panel_node); >> + return -EPROBE_DEFER; >> + } >> of_node_put(panel_node); > Minor nit: Move of_node_put(panel_node) directly below > of_drm_find_panel to avoid duplicating it in both error and normal > paths (like you've done above). Yep, done. Thanks, - Yakir > Sean > >> - return -EPROBE_DEFER; >> } >> >> - of_node_put(panel_node); >> - >> dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); >> if (!dp) >> return -ENOMEM; >> -- >> 1.9.1 >> >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >