From: Arnd Bergmann <arnd@arndb.de>
To: Jiri Kosina <jikos@kernel.org>,
linux-input@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-kernel@vger.kernel.org, Petri Gynther <pgynther@google.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] HID: hid-gfrm: avoid warning for input_configured API change
Date: Tue, 03 Nov 2015 15:56:34 +0100 [thread overview]
Message-ID: <14835877.IL6ArpWV8Q@wuerfel> (raw)
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
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)
next reply other threads:[~2015-11-03 14:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 14:56 Arnd Bergmann [this message]
2015-11-03 19:33 ` [PATCH] HID: hid-gfrm: avoid warning for input_configured API change Petri Gynther
2015-11-03 23:48 ` Dmitry Torokhov
2015-11-04 9:32 ` Jiri Kosina
2015-11-05 18:23 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=14835877.IL6ArpWV8Q@wuerfel \
--to=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=jikos@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pgynther@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).