From patchwork Tue Feb 20 11:55:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128886 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4555705ljc; Tue, 20 Feb 2018 04:00:44 -0800 (PST) X-Google-Smtp-Source: AH8x227HIBs4O1r7wLCRipk27kyktQJqDYdN/R3xPMdoSG6hoTYY4bbLxc/hfQ4FUV5/nFN9HCpt X-Received: by 2002:a17:902:2bc5:: with SMTP id l63-v6mr17529284plb.108.1519128043994; Tue, 20 Feb 2018 04:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519128043; cv=none; d=google.com; s=arc-20160816; b=rnqmWqdc+h+XY3v++6Ymq/rP3eJmzr5vb36CZTxdpOMfP1XzZAg7lLWazlMm7O4daQ iBkv+WX3jpJ0bUa0fdhYFiDqmY1QDdYxWB9cvfGJ3xa+34Q34EpgvTdbxusZu/P5Q4W4 PfaCbfs0O6mJzvVtdLqb+Xu8NfWfTgQ8BdZ7XVtYJwzbqutwKs70aZZCR7B3NrxCW3mo WxQT2gxPTm9AWKZa26FHAhpsKGy61WJmF40IBxtxS9Fxg9H8T0oVFdOpZ962gkqxA/8A qotjRV6NxD9VlwwhHdjhnZ8ZmMH3Qkmq1BKn7eeB8WCyZ6VUQAdx6kz1+pqjyiXuXcyM 5LDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:delivered-to:arc-authentication-results; bh=7Iti05tB3dnwFbKTJybMxbPZY1/NHBU0s5YqzL3GQck=; b=OKyRf2L6zsJvuAptKpTHR9kVneEncMqn+N+s4LPU+C0/czTwLTHpoNDJHB09/vw10/ lsjQOiqxX+ROy9KSBzH0Ghw+varYPcyijuZGk3HeQKwosSz9zUBV26bW+y+5gdWH1Poh /Kb72HCFbde8p21q6c7zGW645SgW0LDtJT5hjnnEU42RFdJcIasYC4mKINX4R+zbkv1R /L+zgtpcdlKJFlh1AZ2EGIR0n0gDrLyDYd1vm4gGo6+b6bqGGngLzwhKJ/fihb+QQD9A hwBc8vH/LPRci1DXOaoDVJ5VTz56GMUYTQjneN8qyJN3W6jowVJKPgb6eUjqpwHGdyfF +qKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id 63si6526484pgg.395.2018.02.20.04.00.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Feb 2018 04:00:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB86389857; Tue, 20 Feb 2018 12:00:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id B92F66E3F8 for ; Tue, 20 Feb 2018 12:00:10 +0000 (UTC) Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MgNde-1f9daM415y-00NkTT; Tue, 20 Feb 2018 13:00:05 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Subject: [4.4-stable 21/22] drm/gma500: remove helper function Date: Tue, 20 Feb 2018 12:55:08 +0100 Message-Id: <20180220115527.1806578-22-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> X-Provags-ID: V03:K0:q/p4+NBZRq4lpLvRnDACsxnQoUi1HDUYwMf3+uPNidiWY/9maG4 uih5VdyfaJ18xkiu93PBoJKcEnwVISlciF2xVkCNZYgdEYM7Hxz/uELE263n0euUVtwY/Wg gnE00x6TTV4iKwKAfuWWBjIRfSm2FPFGkKCEV+Ep5n/t0p4xHLHdmvxUWMIbAgZTVIzBwoL jjmiKCB6HTHuRaFcZihlw== X-UI-Out-Filterresults: notjunk:1; V01:K0:/0l0t03mXDo=:LVZOwjOXLKCRGb9Xf/WROU rIFkelDNZ5W1iGXH/tclW9wPaAqKftTEvUHO/UKZNbXBRGhgE4ZfN2+KGr3FSkARFwZsUYVE0 hKYnMR2pm/Csp3XKvsd74ZOEKEl4s3FAaIxGZ/ze7PuKEM1QOxHLkz/lfDJUbJl2K8r73m167 bnQBHcAMF0C+kSbeD1jj+q4w5EOZiSZvYDviFHobTUhmBizWRq8XDzW3IgDwLyIHmyDfblnjR TLOaNL/kxQNrdk7ily65hsG32dK/JI7V/XCO3WeRUj+yTkfPKzOfWK97YJNWgHzi9dnh79u8Z cTe2fcbJIOx4K6YyqeXRak7OEC4zLHrf5X6twSSd51o6ju/qBg84s6cdL4PeFaJm8IT4Zt1sq swB+7xsArldShz3KslCMiHDDBp1mMr6mLY0h5ZTjUEV8PT9YZn29b04nLfo5f3vGA7FxyWBZ+ oNH+hwsn98HpnUNtBuM5nexDAaqbdfoWImazZikEo7IX1hRlWbTzxSAllmVOMhKVdG1fw1if/ JQKbvPeO2iC5BitLx7DQnoKlCxgIi459XoX5HzGS96XnL2Ye11iBzCq9p0wpG96opWMF0Ty1x P2H+f3WuR3EknSsE5P1ph1vfv50pMjfOW1laTVO00qGrygBUEmGtaCKQYEMEUUFwm6l1tyS0F jPykB4Hh+2mkr8D1pKjPhYzVgH0f7AyvdicuOYeyBxnhetPYDGKG94Alwktnsl0apmDW/2gh+ khl+9mDglF68tpl/HdIRKVLiVOcepesrQlNQFA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sudip Mukherjee , Arnd Bergmann , David Airlie , Greg KH , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Sudip Mukherjee MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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/gma500/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_connector *connector, 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_connector_best_encoder( /*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,