aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-02-02 01:05:55 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-02-08 04:03:17 -0500
commitdb9b60400f9253c25ae639797df2d0ff7a35d9d8 (patch)
tree6ca8c770ee4be9da2daeda5f471332c35ef9cee0
parent1c0230de6dd096e46c46294e93ba68cc16f70331 (diff)
drm/gma500: remove helper function
We were getting build warning about: drivers/gpu/drm/gma500/mdfld_dsi_output.c:407:2: warning: initialization from incompatible pointer type The callback to dpms was pointing to a helper function which had a return type of void, whereas the callback should point to a function which has a return type of int. On closer look it turned out that we do not need the helper function since if we call drm_helper_connector_dpms() directly, the first check that drm_helper_connector_dpms() does is: if (mode == connector->dpms) Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Link: http://patchwork.freedesktop.org/patch/msgid/1454393155-13142-1-git-send-email-sudipm.mukherjee@gmail.com Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rw-r--r--drivers/gpu/drm/gma500/mdfld_dsi_output.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index d758f4cc6805..907cb51795c3 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -382,16 +382,6 @@ static int mdfld_dsi_connector_mode_valid(struct drm_connector *connector,
382 return MODE_OK; 382 return MODE_OK;
383} 383}
384 384
385static void mdfld_dsi_connector_dpms(struct drm_connector *connector, int mode)
386{
387 if (mode == connector->dpms)
388 return;
389
390 /*first, execute dpms*/
391
392 drm_helper_connector_dpms(connector, mode);
393}
394
395static struct drm_encoder *mdfld_dsi_connector_best_encoder( 385static struct drm_encoder *mdfld_dsi_connector_best_encoder(
396 struct drm_connector *connector) 386 struct drm_connector *connector)
397{ 387{
@@ -404,7 +394,7 @@ static struct drm_encoder *mdfld_dsi_connector_best_encoder(
404 394
405/*DSI connector funcs*/ 395/*DSI connector funcs*/
406static const struct drm_connector_funcs mdfld_dsi_connector_funcs = { 396static const struct drm_connector_funcs mdfld_dsi_connector_funcs = {
407 .dpms = /*drm_helper_connector_dpms*/mdfld_dsi_connector_dpms, 397 .dpms = drm_helper_connector_dpms,
408 .detect = mdfld_dsi_connector_detect, 398 .detect = mdfld_dsi_connector_detect,
409 .fill_modes = drm_helper_probe_single_connector_modes, 399 .fill_modes = drm_helper_probe_single_connector_modes,
410 .set_property = mdfld_dsi_connector_set_property, 400 .set_property = mdfld_dsi_connector_set_property,