4.4-stable review patch.  If anyone has any objections, please let me know.


From: Sudip Mukherjee <sudipm.mukher...@gmail.com>

commit db9b60400f9253c25ae639797df2d0ff7a35d9d8 upstream.

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 <su...@vectorindia.org>
Acked-by: Patrik Jakobsson <patrik.r.jakobs...@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
[arnd: rebased to 4.4]
Signed-off-by: Arnd Bergmann <a...@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
 drivers/gpu/drm/gma500/mdfld_dsi_output.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

--- 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_vali
        return MODE_OK;
-static void mdfld_dsi_connector_dpms(struct drm_connector *connector, int mode)
-       if (mode == connector->dpms)
-               return;
-       /*first, execute dpms*/
-       drm_helper_connector_dpms(connector, mode);
 static struct drm_encoder *mdfld_dsi_connector_best_encoder(
                                struct drm_connector *connector)
@@ -404,7 +394,7 @@ static struct drm_encoder *mdfld_dsi_con
 /*DSI connector funcs*/
 static const struct drm_connector_funcs mdfld_dsi_connector_funcs = {
-       .dpms = /*drm_helper_connector_dpms*/mdfld_dsi_connector_dpms,
+       .dpms = drm_helper_connector_dpms,
        .save = mdfld_dsi_connector_save,
        .restore = mdfld_dsi_connector_restore,
        .detect = mdfld_dsi_connector_detect,

Reply via email to