| Message ID | 14835877.IL6ArpWV8Q@wuerfel (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Nov 3, 2015 at 6:56 AM, Arnd Bergmann <arnd@arndb.de> 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 <arnd@arndb.de> Acked-by: Petri Gynther <pgynther@google.com> > 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) > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 03, 2015 at 11:33:11AM -0800, Petri Gynther wrote: > On Tue, Nov 3, 2015 at 6:56 AM, Arnd Bergmann <arnd@arndb.de> 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 <arnd@arndb.de> > > Acked-by: Petri Gynther <pgynther@google.com> 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) > >
On Tue, 3 Nov 2015, Dmitry Torokhov 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 <arnd@arndb.de> > > > > Acked-by: Petri Gynther <pgynther@google.com> > > Hmm, the question is how to merge this, given that one change is in > Jiri's tree and another in mine... In this case probably the best course of action is you cherry-picking b2c68a2f1bab from my tree into yours, and proceeding further. git can handle doubled commits (that will end up in Linus' tree eventually) easily. Another option would be to create a joint merge tree that'd contain both branches merged together and proceed further from that, but I don't think it's worth the hassle for simple case like this. Works for you? Thanks,
On Wed, Nov 04, 2015 at 10:32:24AM +0100, Jiri Kosina wrote: > On Tue, 3 Nov 2015, Dmitry Torokhov 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 <arnd@arndb.de> > > > > > > Acked-by: Petri Gynther <pgynther@google.com> > > > > Hmm, the question is how to merge this, given that one change is in > > Jiri's tree and another in mine... > > In this case probably the best course of action is you cherry-picking > b2c68a2f1bab from my tree into yours, and proceeding further. git can > handle doubled commits (that will end up in Linus' tree eventually) > easily. > > Another option would be to create a joint merge tree that'd contain both > branches merged together and proceed further from that, but I don't think > it's worth the hassle for simple case like this. > > Works for you? I went the cherry-pick route. Thanks.
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)
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 <arnd@arndb.de> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html