HID: hid-gfrm: avoid warning for input_configured API change

arndb · dtor · commit e60e063c14b1 · 2015-11-05T10:15:35.000-08:00
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: 34fc132 ("HID: hid-gfrm: Google Fiber TV Box remote controls") Fixes: b2c68a2 ("HID: hid-input: allow input_configured callback return errors") Acked-by: Petri Gynther <pgynther@google.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
diff --git a/drivers/hid/hid-gfrm.c b/drivers/hid/hid-gfrm.c
@@ -88,14 +88,15 @@ 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:
 	 * - repeat delay: 400 msec
 	 * - 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)

Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,15 @@ static int gfrm_raw_event(struct hid_device hdev, struct hid_report report,`
`88`	`88`	`return (ret < 0) ? ret : -1;`
`89`	`89`	`}`
`90`	`90`
`91`		`-static void gfrm_input_configured(struct hid_device hid, struct hid_input hidinput)`
	`91`	`+static int gfrm_input_configured(struct hid_device hid, struct hid_input hidinput)`
`92`	`92`	`{`
`93`	`93`	`/*`
`94`	`94`	`* Enable software autorepeat with:`
`95`	`95`	`* - repeat delay: 400 msec`
`96`	`96`	`* - repeat period: 100 msec`
`97`	`97`	`*/`
`98`	`98`	`input_enable_softrepeat(hidinput->input, 400, 100);`
	`99`	`+ return 0;`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`static int gfrm_probe(struct hid_device hdev, const struct hid_device_id id)`