From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-cys01nam02on0137.outbound.protection.outlook.com ([104.47.37.137]:54886 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032593AbeCAPjV (ORCPT ); Thu, 1 Mar 2018 10:39:21 -0500 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Sudip Mukherjee , Sudip Mukherjee , Daniel Vetter , Sasha Levin Subject: [added to the 4.1 stable tree] drm/gma500: remove helper function Date: Thu, 1 Mar 2018 15:27:42 +0000 Message-ID: <20180301152116.1486-490-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Sudip Mukherjee This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D [ Upstream commit db9b60400f9253c25ae639797df2d0ff7a35d9d8 ] 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 =3D=3D connector->dpms) Signed-off-by: Sudip Mukherjee Link: http://patchwork.freedesktop.org/patch/msgid/1454393155-13142-1-git-s= end-email-sudipm.mukherjee@gmail.com Acked-by: Patrik Jakobsson Signed-off-by: Daniel Vetter Signed-off-by: Sasha Levin --- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gm= a500/mdfld_dsi_output.c index 89f705c3a5eb..910a2f253990 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_c= onnector *connector, return MODE_OK; } =20 -static void mdfld_dsi_connector_dpms(struct drm_connector *connector, int = mode) -{ - if (mode =3D=3D 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_connector_best_enc= oder( =20 /*DSI connector funcs*/ static const struct drm_connector_funcs mdfld_dsi_connector_funcs =3D { - .dpms =3D /*drm_helper_connector_dpms*/mdfld_dsi_connector_dpms, + .dpms =3D drm_helper_connector_dpms, .save =3D mdfld_dsi_connector_save, .restore =3D mdfld_dsi_connector_restore, .detect =3D mdfld_dsi_connector_detect, --=20 2.14.1