From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752587AbcBFRJQ (ORCPT ); Sat, 6 Feb 2016 12:09:16 -0500 Received: from mail-lf0-f53.google.com ([209.85.215.53]:32967 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbcBFRJP (ORCPT ); Sat, 6 Feb 2016 12:09:15 -0500 MIME-Version: 1.0 In-Reply-To: <1454393155-13142-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1454393155-13142-1-git-send-email-sudipm.mukherjee@gmail.com> Date: Sat, 6 Feb 2016 18:09:13 +0100 Message-ID: Subject: Re: [PATCH] drm/gma500: remove helper function From: Patrik Jakobsson To: Sudip Mukherjee Cc: David Airlie , Daniel Vetter , linux-kernel , dri-devel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 2, 2016 at 7:05 AM, Sudip Mukherjee wrote: > 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 Looks good, thanks. Signed-off-by: Patrik Jakobsson > --- > 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 d758f4c..907cb51 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, > .detect = mdfld_dsi_connector_detect, > .fill_modes = drm_helper_probe_single_connector_modes, > .set_property = mdfld_dsi_connector_set_property, > -- > 1.9.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrik Jakobsson Subject: Re: [PATCH] drm/gma500: remove helper function Date: Sat, 6 Feb 2016 18:09:13 +0100 Message-ID: References: <1454393155-13142-1-git-send-email-sudipm.mukherjee@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 89F246E219 for ; Sat, 6 Feb 2016 09:09:15 -0800 (PST) Received: by mail-lf0-f49.google.com with SMTP id j78so74537717lfb.1 for ; Sat, 06 Feb 2016 09:09:15 -0800 (PST) In-Reply-To: <1454393155-13142-1-git-send-email-sudipm.mukherjee@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sudip Mukherjee Cc: Daniel Vetter , linux-kernel , dri-devel List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBGZWIgMiwgMjAxNiBhdCA3OjA1IEFNLCBTdWRpcCBNdWtoZXJqZWUKPHN1ZGlwbS5t dWtoZXJqZWVAZ21haWwuY29tPiB3cm90ZToKPiBXZSB3ZXJlIGdldHRpbmcgYnVpbGQgd2Fybmlu ZyBhYm91dDoKPiBkcml2ZXJzL2dwdS9kcm0vZ21hNTAwL21kZmxkX2RzaV9vdXRwdXQuYzo0MDc6 Mjogd2FybmluZzogaW5pdGlhbGl6YXRpb24KPiAgICAgICAgIGZyb20gaW5jb21wYXRpYmxlIHBv aW50ZXIgdHlwZQo+Cj4gVGhlIGNhbGxiYWNrIHRvIGRwbXMgd2FzIHBvaW50aW5nIHRvIGEgaGVs cGVyIGZ1bmN0aW9uIHdoaWNoIGhhZCBhCj4gcmV0dXJuIHR5cGUgb2Ygdm9pZCwgd2hlcmVhcyB0 aGUgY2FsbGJhY2sgc2hvdWxkIHBvaW50IHRvIGEgZnVuY3Rpb24KPiB3aGljaCBoYXMgYSByZXR1 cm4gdHlwZSBvZiBpbnQuCj4gT24gY2xvc2VyIGxvb2sgaXQgdHVybmVkIG91dCB0aGF0IHdlIGRv IG5vdCBuZWVkIHRoZSBoZWxwZXIgZnVuY3Rpb24KPiBzaW5jZSBpZiB3ZSBjYWxsIGRybV9oZWxw ZXJfY29ubmVjdG9yX2RwbXMoKSBkaXJlY3RseSwgdGhlIGZpcnN0IGNoZWNrCj4gdGhhdCBkcm1f aGVscGVyX2Nvbm5lY3Rvcl9kcG1zKCkgZG9lcyBpczogaWYgKG1vZGUgPT0gY29ubmVjdG9yLT5k cG1zKQo+Cj4gU2lnbmVkLW9mZi1ieTogU3VkaXAgTXVraGVyamVlIDxzdWRpcEB2ZWN0b3JpbmRp YS5vcmc+CgpMb29rcyBnb29kLCB0aGFua3MuCgpTaWduZWQtb2ZmLWJ5OiBQYXRyaWsgSmFrb2Jz c29uIDxwYXRyaWsuci5qYWtvYnNzb25AZ21haWwuY29tPgoKPiAtLS0KPiAgZHJpdmVycy9ncHUv ZHJtL2dtYTUwMC9tZGZsZF9kc2lfb3V0cHV0LmMgfCAxMiArLS0tLS0tLS0tLS0KPiAgMSBmaWxl IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxMSBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vZ21hNTAwL21kZmxkX2RzaV9vdXRwdXQuYyBiL2RyaXZlcnMvZ3B1 L2RybS9nbWE1MDAvbWRmbGRfZHNpX291dHB1dC5jCj4gaW5kZXggZDc1OGY0Yy4uOTA3Y2I1MSAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZ21hNTAwL21kZmxkX2RzaV9vdXRwdXQuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9nbWE1MDAvbWRmbGRfZHNpX291dHB1dC5jCj4gQEAgLTM4 MiwxNiArMzgyLDYgQEAgc3RhdGljIGludCBtZGZsZF9kc2lfY29ubmVjdG9yX21vZGVfdmFsaWQo c3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKPiAgICAgICAgIHJldHVybiBNT0RFX09L Owo+ICB9Cj4KPiAtc3RhdGljIHZvaWQgbWRmbGRfZHNpX2Nvbm5lY3Rvcl9kcG1zKHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGludCBtb2RlKQo+IC17Cj4gLSAgICAgICBpZiAobW9k ZSA9PSBjb25uZWN0b3ItPmRwbXMpCj4gLSAgICAgICAgICAgICAgIHJldHVybjsKPiAtCj4gLSAg ICAgICAvKmZpcnN0LCBleGVjdXRlIGRwbXMqLwo+IC0KPiAtICAgICAgIGRybV9oZWxwZXJfY29u bmVjdG9yX2RwbXMoY29ubmVjdG9yLCBtb2RlKTsKPiAtfQo+IC0KPiAgc3RhdGljIHN0cnVjdCBk cm1fZW5jb2RlciAqbWRmbGRfZHNpX2Nvbm5lY3Rvcl9iZXN0X2VuY29kZXIoCj4gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQo+ ICB7Cj4gQEAgLTQwNCw3ICszOTQsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9lbmNvZGVyICptZGZs ZF9kc2lfY29ubmVjdG9yX2Jlc3RfZW5jb2RlcigKPgo+ICAvKkRTSSBjb25uZWN0b3IgZnVuY3Mq Lwo+ICBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3MgbWRmbGRfZHNpX2Nv bm5lY3Rvcl9mdW5jcyA9IHsKPiAtICAgICAgIC5kcG1zID0gLypkcm1faGVscGVyX2Nvbm5lY3Rv cl9kcG1zKi9tZGZsZF9kc2lfY29ubmVjdG9yX2RwbXMsCj4gKyAgICAgICAuZHBtcyA9IGRybV9o ZWxwZXJfY29ubmVjdG9yX2RwbXMsCj4gICAgICAgICAuZGV0ZWN0ID0gbWRmbGRfZHNpX2Nvbm5l Y3Rvcl9kZXRlY3QsCj4gICAgICAgICAuZmlsbF9tb2RlcyA9IGRybV9oZWxwZXJfcHJvYmVfc2lu Z2xlX2Nvbm5lY3Rvcl9tb2RlcywKPiAgICAgICAgIC5zZXRfcHJvcGVydHkgPSBtZGZsZF9kc2lf Y29ubmVjdG9yX3NldF9wcm9wZXJ0eSwKPiAtLQo+IDEuOS4xCj4KX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==