[PATCH v5 05/11] drm: bridge: allow some funcs to be optional

From: Chris Zhong
Date: Thu Nov 26 2015 - 02:51:07 EST


Check the validity of post_disable/pre_enable in bridge->funcs before
call them.

Signed-off-by: Chris Zhong <zyw@xxxxxxxxxxxxxx>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

drivers/gpu/drm/drm_bridge.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 6b8f721..8f29330 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -223,7 +223,8 @@ void drm_bridge_post_disable(struct drm_bridge *bridge)
if (!bridge)
return;

- bridge->funcs->post_disable(bridge);
+ if (bridge->funcs->post_disable)
+ bridge->funcs->post_disable(bridge);

drm_bridge_post_disable(bridge->next);
}
@@ -273,7 +274,8 @@ void drm_bridge_pre_enable(struct drm_bridge *bridge)

drm_bridge_pre_enable(bridge->next);

- bridge->funcs->pre_enable(bridge);
+ if (bridge->funcs->pre_enable)
+ bridge->funcs->pre_enable(bridge);
}
EXPORT_SYMBOL(drm_bridge_pre_enable);

--
2.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/