Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1710239ybz; Thu, 16 Apr 2020 14:10:14 -0700 (PDT) X-Google-Smtp-Source: APiQypJ7oaKBcJXvri0siHKHb93AsfotTKFxLG7lhnLjDEYdDvvOcyX7O8MN36CCwop0x13KL8vZ X-Received: by 2002:a50:8a03:: with SMTP id i3mr126545edi.121.1587071414694; Thu, 16 Apr 2020 14:10:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587071414; cv=none; d=google.com; s=arc-20160816; b=CnR03OzJWtnwnMs1RKkHr0uiOoCTiWXOys7Kw2X0fD8/5UOhuNXHs9lyZ8UAB3+9pj INWEMSGSb4x0meTS2UVlKszosw89/hXmRaGN5K1g1OMYomY3lxYGuG+M5M7KRWnnDt/p uW98yXdnGfZe+qhkGG/edTLBSEa0EG8r5z9DN3QfvnLCtgEYDyVxFnC6R3vaNkB1/AJ9 ZaQgajHoCimXwEK5C1kp7Io7XSQ1Ig2BimTlhWoEfIyCsGi0hALEvd4zxADCPfpW7d// swAfU8Dx2prkA+4A+hConpXpDNpGRElB1Rwzp2Qp2FBSe3d/+rFGw5e2+HTZQ/NgtTpn Vd1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=rwkJJX1v6FB/Epds59Jju2AwLow4jJighTeM9o/Pwdc=; b=by14xjPg1jXzQ5yA6uWkGvij8+M8qnP4mc2IO8Kyfr4CrfbCoaLbQJ6NALSU1v2DM6 NVC/ebankP7q8tlWVstOPV05/w98t99RO7IOj2JWgtWpkhipFepBaGJBCjiwGNAVZQlj XIE6pYgFXDmas+9UD1IqCd1NrGT1HUDxYfSetlfZIfcGs7s3wGbI/DyKJ/z71pkoH4xJ 5MFPwMKZNvYC21r4/UWct/2ZIDszqBOfVensYVFyAfCj9INP5KAsFa4THLzlSh7y+hou OaeELbGMT6LRf4/V22rcOggDZ/lP/xT5+xQwKkK2TDIVx3lh7Gfb2GJJ87wQMwC/rFoR +r8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s27si7229032eja.411.2020.04.16.14.09.47; Thu, 16 Apr 2020 14:10:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728576AbgDPVHD (ORCPT + 99 others); Thu, 16 Apr 2020 17:07:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726320AbgDPVHC (ORCPT ); Thu, 16 Apr 2020 17:07:02 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EF4EC061A0C for ; Thu, 16 Apr 2020 14:07:02 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 4501F2A23DF From: Enric Balletbo i Serra To: linux-kernel@vger.kernel.org Cc: Collabora Kernel ML , sam@ravnborg.org, laurent.pinchart@ideasonboard.com, Andrzej Hajda , Daniel Vetter , David Airlie , Jernej Skrabec , Jonas Karlman , Laurent Pinchart , Neil Armstrong , dri-devel@lists.freedesktop.org Subject: [PATCH] drm/bridge: panel: Return always an error pointer in drm_panel_bridge_add() Date: Thu, 16 Apr 2020 23:06:54 +0200 Message-Id: <20200416210654.2468805-1-enric.balletbo@collabora.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 89958b7cd955 ("drm/bridge: panel: Infer connector type from panel by default"), drm_panel_bridge_add() and their variants can return NULL and an error pointer. This is fine but none of the actual users of the API are checking for the NULL value. Instead of change all the users, seems reasonable to return an error pointer instead. So change the returned value for those functions when the connector type is unknown. Suggested-by: Laurent Pinchart Signed-off-by: Enric Balletbo i Serra --- drivers/gpu/drm/bridge/panel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 8461ee8304ba..7a3df0f319f3 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -166,7 +166,7 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { * * The connector type is set to @panel->connector_type, which must be set to a * known type. Calling this function with a panel whose connector type is - * DRM_MODE_CONNECTOR_Unknown will return NULL. + * DRM_MODE_CONNECTOR_Unknown will return ERR_PTR(-EINVAL). * * See devm_drm_panel_bridge_add() for an automatically managed version of this * function. @@ -174,7 +174,7 @@ static const struct drm_bridge_funcs panel_bridge_bridge_funcs = { struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel) { if (WARN_ON(panel->connector_type == DRM_MODE_CONNECTOR_Unknown)) - return NULL; + return ERR_PTR(-EINVAL); return drm_panel_bridge_add_typed(panel, panel->connector_type); } @@ -265,7 +265,7 @@ struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev, struct drm_panel *panel) { if (WARN_ON(panel->connector_type == DRM_MODE_CONNECTOR_Unknown)) - return NULL; + return ERR_PTR(-EINVAL); return devm_drm_panel_bridge_add_typed(dev, panel, panel->connector_type); -- 2.25.1