korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 15:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/bridge: panel: Return always an error pointer in drm_panel_bridge_add()

Browse Source 
Since commit 89958b7cd9 ("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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200416210654.2468805-1-enric.balletbo@collabora.com
This commit is contained in:
Enric Balletbo i Serra 2020-04-16 23:06:54 +02:00 committed by Sam Ravnborg
parent 4606ed7ede
commit 30be303108
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/bridge/panel.c
View File

@ -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 * 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 * 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 * See devm_drm_panel_bridge_add() for an automatically managed version of this
* function. * 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) struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel)
{ {
if (WARN_ON(panel->connector_type == DRM_MODE_CONNECTOR_Unknown)) 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); 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) struct drm_panel *panel)
{ {
if (WARN_ON(panel->connector_type == DRM_MODE_CONNECTOR_Unknown)) 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, return devm_drm_panel_bridge_add_typed(dev, panel,
panel->connector_type); panel->connector_type);