Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756094AbbKCXsI (ORCPT ); Tue, 3 Nov 2015 18:48:08 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:34385 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752641AbbKCXsG (ORCPT ); Tue, 3 Nov 2015 18:48:06 -0500 Date: Tue, 3 Nov 2015 15:48:02 -0800 From: Dmitry Torokhov To: Petri Gynther Cc: Arnd Bergmann , Jiri Kosina , linux-input , linux-kernel , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] HID: hid-gfrm: avoid warning for input_configured API change Message-ID: <20151103234802.GC29032@dtor-ws> References: <14835877.IL6ArpWV8Q@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2067 Lines: 52 On Tue, Nov 03, 2015 at 11:33:11AM -0800, Petri Gynther wrote: > On Tue, Nov 3, 2015 at 6:56 AM, Arnd Bergmann wrote: > > The input_configured callback was recently changed to return > > an 'int', but the newly added driver uses the old API: > > > > drivers/hid/hid-gfrm.c:151:22: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] > > > > This changes the driver like the other ones. > > > > Signed-off-by: Arnd Bergmann > > Acked-by: Petri Gynther Hmm, the question is how to merge this, given that one change is in Jiri's tree and another in mine... > > > Fixes: 34fc1322e7aa ("HID: hid-gfrm: Google Fiber TV Box remote controls") > > Fixes: b2c68a2f1bab ("HID: hid-input: allow input_configured callback return errors") > > --- > > Found on ARM allmodconfig with yesterday's linux-next > > > > diff --git a/drivers/hid/hid-gfrm.c b/drivers/hid/hid-gfrm.c > > index 4d7b7e7f0792..075b1c020846 100644 > > --- a/drivers/hid/hid-gfrm.c > > +++ b/drivers/hid/hid-gfrm.c > > @@ -88,7 +88,7 @@ static int gfrm_raw_event(struct hid_device *hdev, struct hid_report *report, > > return (ret < 0) ? ret : -1; > > } > > > > -static void gfrm_input_configured(struct hid_device *hid, struct hid_input *hidinput) > > +static int gfrm_input_configured(struct hid_device *hid, struct hid_input *hidinput) > > { > > /* > > * Enable software autorepeat with: > > @@ -96,6 +96,7 @@ static void gfrm_input_configured(struct hid_device *hid, struct hid_input *hidi > > * - repeat period: 100 msec > > */ > > input_enable_softrepeat(hidinput->input, 400, 100); > > + return 0; > > } > > > > static int gfrm_probe(struct hid_device *hdev, const struct hid_device_id *id) > > -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/