Received: by 10.223.185.116 with SMTP id b49csp1115110wrg; Fri, 23 Feb 2018 12:11:09 -0800 (PST) X-Google-Smtp-Source: AH8x224gOd4CF6TDbhE1B0LKxyg5dIj+zBbfulBxBBw/Q990amOWHr5QZyNSRykDvwphhDUaoxCV X-Received: by 2002:a17:902:8a94:: with SMTP id p20-v6mr2774677plo.74.1519416669060; Fri, 23 Feb 2018 12:11:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519416669; cv=none; d=google.com; s=arc-20160816; b=tsQFmMYxHcb/ArLqZgxy+EwJ/uByu6ZUwHJ3Q0Yq5/ZBgLMjCKRbamHTdKlhSbhuPP 5F/UJf4wUWGOVY8Ic4Ksi128YUB21QgqDd+5JTSgD5syGq/RoG3c2Q47iA2TeeHYXCT3 dt0qIUTpdsO7X0k+CgKUKYtLef08ctmX6tg61KBCL4zxxkGrb2q47c2M5YdpzZjGbTeF ZEILw/t9RqaiPVxH4Agg4V82Lym0qR4lTJjQoGMybxc9D3KSiNALTUURXzr5DiAyh9Ia mGOWzECpNPVx1EqujsXP+/x2LAMdOs1Hqr12G5zzCgf4mksGACN1H22l5ZqloAlfPCDL k3hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=GfzL3acHzTqGXjhDODh1xSqhlllYf/lDZobwt/V2FCo=; b=r7GpOkPdldXFn7qmGJ6hKIz7ZVcqfCrgZo+gSUOzEgDQI2bz3/V6VuqKNN9XyEZ1sR av6swU378UKdQsNe6korgDuQ237Mjub7aCixmaBr/57yBP1cnkJIF76ACKfhiboJCPhP DyB0iTkA2LuCAsKUUuHA0zATI9Gpl5yoKp+V/DRHDzLc/PJm7S7rS9gtTs3DZ2cVsY+G WAhY9kI/vv50Cx/mMbezMqN3Lw/KsGib/vablJpAu5W30J4cQVvUAcJH2eZ4VWtFWUFL sAkmkJGJHihGx9zHEiKWyYaAhYx2ROjrEcneGp9zI9qKzsGMtuxHt/0y5ONWkc4Cz5bm qTLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t16si2259657pfj.149.2018.02.23.12.10.54; Fri, 23 Feb 2018 12:11:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932990AbeBWSmK (ORCPT + 99 others); Fri, 23 Feb 2018 13:42:10 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:41220 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932592AbeBWSmF (ORCPT ); Fri, 23 Feb 2018 13:42:05 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 83663DBE; Fri, 23 Feb 2018 18:42:04 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Sudip Mukherjee , Patrik Jakobsson , Daniel Vetter , Arnd Bergmann Subject: [PATCH 4.4 162/193] drm/gma500: remove helper function Date: Fri, 23 Feb 2018 19:26:35 +0100 Message-Id: <20180223170351.282987038@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sudip Mukherjee 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 Link: http://patchwork.freedesktop.org/patch/msgid/1454393155-13142-1-git-send-email-sudipm.mukherjee@gmail.com Acked-by: Patrik Jakobsson Signed-off-by: Daniel Vetter [arnd: rebased to 4.4] Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- 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,