From patchwork Thu Mar 1 15:27:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130300 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2953041edc; Thu, 1 Mar 2018 07:39:03 -0800 (PST) X-Google-Smtp-Source: AG47ELv89Xp0w9ccYatXNSQVaNGLOUqDWeeh3aRGPALaOd8UY7JZISATFc6tsENi0lJdEckt9ZVZ X-Received: by 10.101.101.206 with SMTP id y14mr1821597pgv.297.1519918743620; Thu, 01 Mar 2018 07:39:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918743; cv=none; d=google.com; s=arc-20160816; b=TdtAVP0odOQAPj/KGcrpfuk5DKNQ3vxVWMrUq4GPj8/9Me/YBZpyAsErcTF5gIJ+gf FdCf8losYVdwgw/WLcV1JqNXQF6izHWPmg9V1ohMBRpn48fQdCeUWf8TMYQTuJuZMPGT qDkko2SLvcbufqcLymS7GGLcdJpJraYQIIq21QKwMi/eUJ/yjiUOIngfirN3ur4sTayt kixpr+SCBuQ0vGX1p5+O9rPjVToov/2duSGdiEECJDDFoBxB3XKP343dXdWsQoec6S8c Z0b9s1ndWz3OfY8Kw9X328MAWfcsEs53EtHyvmpy1pnAQH5Ba2gwX9WyDCZMqEbmuM/P lrfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-id:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=8T+oZqJdCzGyNN7NS6XJM2HDURZURMs84iY3PjGYuI8=; b=uhorKcyynNAzwQ/0N6cCORNCoZoeE4R0BsIXGpLW2zhvv1ZkXsemseryd2da+kGKWh BKYgFstdK5TRIrsFUimAAJFY1I1ozIa+PMUqi81k8oP8WUVLQCOSDNglfGwV73x7n6e0 jIuOpnAH2mtaBjHemPK11AgLc4Mre6sNN6E99Lo26l8Kp6szAlvwmHEd2Tkrow62h6f/ WvKTKuWmWo85Z9JnaqQ3n8m3iIX0jz5QVwpHW7wY6zhIhJjuE+VWCR705fIB171+e/fb PGvetc8n8qLa1rLZTctkQq4Lz8ZWZXSd2DCzMKizI5oeWP1q3SE8RONTek9Iir8v51IQ BFGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Up5SyWE0; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si2586092pgs.318.2018.03.01.07.39.03; Thu, 01 Mar 2018 07:39:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Up5SyWE0; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032349AbeCAPjA (ORCPT + 10 others); Thu, 1 Mar 2018 10:39:00 -0500 Received: from mail-bn3nam01on0130.outbound.protection.outlook.com ([104.47.33.130]:32096 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032022AbeCAPim (ORCPT ); Thu, 1 Mar 2018 10:38:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8T+oZqJdCzGyNN7NS6XJM2HDURZURMs84iY3PjGYuI8=; b=Up5SyWE0Zxr0gstrwvRWWknxDBK2/c+X4yG+BTxcAiTSpu5BDxhtquDqvtPhglNQBvvVWlhL6nBbdiR3mdI4UFoJf7GJKl22mfQJFHLmRkivejWjbbjPUNWG5wAaMW26kBd8+XQMzTHbEhXfyLHX2GzzrUpOCGeQQmrFuDgVtlM= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:38:39 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:38:39 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Dmitry Torokhov , Sasha Levin Subject: [added to the 4.1 stable tree] Input: tca8418_keypad - hide gcc-4.9 -Wmaybe-uninitialized warning Thread-Topic: [added to the 4.1 stable tree] Input: tca8418_keypad - hide gcc-4.9 -Wmaybe-uninitialized warning Thread-Index: AQHTsXHS+KAXwg3RRUejQIG3UUnl8Q== Date: Thu, 1 Mar 2018 15:27:34 +0000 Message-ID: <20180301152116.1486-476-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0902; 7:2SJFPQokfah2pavlz45XIFIL2IRUe1SfbByPxpyoNfBuucuDvc3XpnUFQbaJw2e+bb850Mw2X7R2DDZraHHMHtt9hop9xrztD20l6mub26Z28WAoRvrInr23BJSsb4AOhZscx7PB2qELoaPWakThZMm0LglSO3+HUqLypZJ5noHCnD6hTooH4JO/w6Iu6TmIQcf1TiXGSnkzWnUjiUviN0qOIFx9waPggVA/AMq7iSbpeIKoZnthCSs4n9ygQEEJ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c3f837bd-e747-4329-d24e-08d57f8a8199 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(17755550239193); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501229)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(376002)(39380400002)(39860400002)(346002)(199004)(189003)(6116002)(72206003)(1076002)(3846002)(25786009)(2900100001)(36756003)(14454004)(316002)(3660700001)(6666003)(54906003)(110136005)(2950100002)(305945005)(7736002)(99286004)(5250100002)(86612001)(10090500001)(107886003)(66066001)(106356001)(2501003)(6512007)(6486002)(97736004)(6436002)(22452003)(68736007)(81166006)(8676002)(81156014)(53936002)(186003)(26005)(105586002)(3280700002)(8936002)(76176011)(478600001)(4326008)(10290500003)(86362001)(5660300001)(39060400002)(2906002)(6506007)(102836004)(59450400001)(6346003)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: WsKBPVCL0G+4DGMAdE591sQixpaerERu7TQCmF3BuK5fn1c24CA64JxreodHwvB+s0ubpAumS7Z60zzygs6eWqAcR6/uR4Rof/hEH4dYOifTk/SrAxxcUGtFuU9PGqHb+C5x5y0RE3TCGoh3aX1Q697h8SexM/ExYFMDr6ZxBbk= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <9F489B2188C0D748B762D1CBE3583F92@namprd21.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3f837bd-e747-4329-d24e-08d57f8a8199 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:34.6393 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit ea4348c8462a20e8b1b6455a7145d2b86f8a49b6 ] Older versions of gcc warn about the tca8418_irq_handler function as they can't keep track of the variable assignment inside of the loop when using the -Wmaybe-unintialized flag: drivers/input/keyboard/tca8418_keypad.c: In function ‘tca8418_irq_handler’: drivers/input/keyboard/tca8418_keypad.c:172:9: error: ‘reg’ may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/input/keyboard/tca8418_keypad.c:165:5: note: ‘reg’ was declared here This is fixed in gcc-6, but it's possible to rearrange the code in a way that avoids the warning on older compilers as well. Signed-off-by: Arnd Bergmann Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/keyboard/tca8418_keypad.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c index 4e491c1762cf..5c4f7f8f2c20 100644 --- a/drivers/input/keyboard/tca8418_keypad.c +++ b/drivers/input/keyboard/tca8418_keypad.c @@ -164,11 +164,18 @@ static void tca8418_read_keypad(struct tca8418_keypad *keypad_data) int error, col, row; u8 reg, state, code; - /* Initial read of the key event FIFO */ - error = tca8418_read_byte(keypad_data, REG_KEY_EVENT_A, ®); + do { + error = tca8418_read_byte(keypad_data, REG_KEY_EVENT_A, ®); + if (error < 0) { + dev_err(&keypad_data->client->dev, + "unable to read REG_KEY_EVENT_A\n"); + break; + } + + /* Assume that key code 0 signifies empty FIFO */ + if (reg <= 0) + break; - /* Assume that key code 0 signifies empty FIFO */ - while (error >= 0 && reg > 0) { state = reg & KEY_EVENT_VALUE; code = reg & KEY_EVENT_CODE; @@ -184,11 +191,7 @@ static void tca8418_read_keypad(struct tca8418_keypad *keypad_data) /* Read for next loop */ error = tca8418_read_byte(keypad_data, REG_KEY_EVENT_A, ®); - } - - if (error < 0) - dev_err(&keypad_data->client->dev, - "unable to read REG_KEY_EVENT_A\n"); + } while (1); input_sync(input); }