From patchwork Tue Nov 3 14:56:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7543001 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 106B09F36A for ; Tue, 3 Nov 2015 14:57:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C36920647 for ; Tue, 3 Nov 2015 14:57:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E9AE20632 for ; Tue, 3 Nov 2015 14:57:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752405AbbKCO53 (ORCPT ); Tue, 3 Nov 2015 09:57:29 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:50059 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752130AbbKCO52 (ORCPT ); Tue, 3 Nov 2015 09:57:28 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0MGzR4-1Zh1ov36Pa-00DnwH; Tue, 03 Nov 2015 15:56:35 +0100 From: Arnd Bergmann To: Jiri Kosina , linux-input@vger.kernel.org, Dmitry Torokhov Cc: linux-kernel@vger.kernel.org, Petri Gynther , 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 Message-ID: <14835877.IL6ArpWV8Q@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:He604eld8dwotC5x2cUhbVR2Us4gzCr4DWQoEWwaqnGAS1V/50O N4ZZof6eFIpDdW17ki2P56OLBAToO7+POHfZneyx/TTf9d7ORSpi/9QktofnDwXC/Rdz44N PIAmlCrFmXZmlneo7QOOWgnH/Ga22yyNsbMEhdjF3cjy1gAVVlHWN8CoHjb7shOmjPrdbEC n/xxsn0EiWFOpgWODVaiA== X-UI-Out-Filterresults: notjunk:1; V01:K0:FkZx1RROYyI=:qC1EBqOcyAorRnjrs+3CpT 952P2XpSaGztXyEiE9xRpxQ6+5TGxuQEDkkPBNnOwIM9+77tGa+yLt/CUSlCNvM9seYBGAaZ0 CQ31Kua35frxuWWD/YMLIyLLvqaCgVIv2/CVdeaIp0tt2i/onCOyWTk4k4w7diGM+FdM+JN34 EgMPqSvE+dodAQMUgQe2SNDum/VskYVg5BpWZc3Tzis+CAKoje1q/eVDCCjcg0Tbos7RF9Ob3 k8Yi8gIYbNxArnvdOCdDptTMF/4P+SWU6WknGPRNqgmuk8mKZTe5s1HgLEZAilhFX8xe3jcLT egEqdUgY54seMfLkxjdNb+URfGlupgeg8lCsdthNMNbUM2vHegz+l6AzidEWtdj/4fQDcBfog kTUmDyv55OyLFF2UaJjdafWiSfZaaUquEe7+7AqNdViZSm7JGBxnyKurboIuFYXnPhorOS+HZ MhVQccskmRkkd+Iuk+l+xH0SKgLV4WjcUMWdfK8X2FGjF00zhfVRq7AstZcO4UGBthsn586+y XX/coHZs2oZQHXbh2xG+fpeFQgSrZJnLjszLvsGwNrdD7LwWjGJK8YkQpGXpSDAiAd8gN8z3J mqpjXni/7eW+ik39nCYASr4bRBL5XsRYQa9MONQutXDD3rsS1n/4tqUxpEljx4RZfgat2GGNL uOV74QeMJf4bNek36s4U8q+HBY3SmfnLMtuqxE3gmV/6LqywzgkxvKyTwWxyaWm5J2UQwfIyD 2fiANqFonWS+ISzF Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Fixes: 34fc1322e7aa ("HID: hid-gfrm: Google Fiber TV Box remote controls") Fixes: b2c68a2f1bab ("HID: hid-input: allow input_configured callback return errors") Acked-by: Petri Gynther --- 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 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)