Received: by 10.223.176.46 with SMTP id f43csp1450333wra; Fri, 19 Jan 2018 11:44:27 -0800 (PST) X-Google-Smtp-Source: ACJfBovHjTZjMiaFItQre2Wj2aFHM37eP9OLP+oqe9sYIhl1TKN0fb9mG2Ol8tdjOwZ0DOQ6aBV7 X-Received: by 10.101.85.138 with SMTP id j10mr29609948pgs.144.1516391066960; Fri, 19 Jan 2018 11:44:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516391066; cv=none; d=google.com; s=arc-20160816; b=04+cVVqvpsTLhToZyZoDdvdfgjXAScf4hlZoEd/mAOVqA5XwKsxhfTvGxt5OOjatGm pZnrTF3zMO+H1f4kXwm9Ab13jjKMYT92pfALrlRWXXoYuc86pkK9dTuFJQcfve1eNvRC bb08QG2S/8VDPmlNWm4756QaiyyGTWFQu/gIpZZ6pIK7/GxjCXOPbl7sr0cSmrpDe9vW fuo1l18sMh523P5uCMCHi2mqY0RtDKzLOCu6mIrJslb+mY/oMKEDXp2AAJMDsT1mgP4G 5T+kx0PqtyE9SVU3qAbwYME5RxVFyamQNCOHBOoQQFrmPurPy7/r3YtNcFiP1Whe8f/F 7qbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=HLG1uyel0dkhd9oRCy3LmolHXcVKqV7K5K6ziE2EdYM=; b=0bIObYjXPwOi1ZObnRSyn58SJZnDGy6Z6necfNhjonyaeydWoZVyLzeUygo6ZLZ9K0 vOcIQzscSIjPfurjk8sGR9NZ6tsfuG7dKRakDURQ1kLTbxH7B/hPj82QvaYHaOBskff4 G+5oRb7havuUFeuKlmxP2hW5i39TnmUAzBgnbgC1iy5Cle2i8MMacYkf24rmqkJEsCMf zdlZc3g34Y6TBqVdg8+A6ddJOtE961VLRm8t/jqzpiW6h6x4UQoZvv+onzELdZiDZmpN THd9I0knmZ0Zb+eQJIZgmXabx3Aoj01aaI1+S5tu3mqmF/TS+2himZ3ZkZqQ+SYrNNzp qb/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=h1K962yN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x141si8921392pgx.601.2018.01.19.11.44.13; Fri, 19 Jan 2018 11:44:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@gmail.com header.s=20161025 header.b=h1K962yN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756321AbeASTle (ORCPT + 99 others); Fri, 19 Jan 2018 14:41:34 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:43829 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756203AbeASTlQ (ORCPT ); Fri, 19 Jan 2018 14:41:16 -0500 Received: by mail-pg0-f65.google.com with SMTP id n17so2161781pgf.10; Fri, 19 Jan 2018 11:41:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HLG1uyel0dkhd9oRCy3LmolHXcVKqV7K5K6ziE2EdYM=; b=h1K962yNXETXaeNmXQZjDFqAhRuY2qpLQ/RZRS6P/Ai2ziipWt1YVioZFzeBRsXgWf 2bf4P4hwp/KgMPh7pkaDH2tHnui71i2De0T4/Cj3gqcM7KZVUYIPYfzsStzsA2VOz1N8 CMY+qOEf/z3Da1xf4UxPlsEafIGQT5uOPLS7hDTIEYhY27c3JMK1+XAht0fgE/MogtkO wl7ZeUCP7VfINmpdJllooGiQPuzwldSkJNm05BCC1aK0cMErktnS3O7y4C/N6mQBcHlE 9SwD0LbeBMALGEghbmp4lNSgX50DxpCvHcP+TETP5yOD84JJ8SE/rn3gRoTLHUBepeuy H/fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HLG1uyel0dkhd9oRCy3LmolHXcVKqV7K5K6ziE2EdYM=; b=ek89fTTx2mDHN899PfUqtNu1/xypurCx/34Ie7+zld6kDoknUBW9tUI39sFjUMUdYA TR+8859JS4YYVlwb6ZWkojGw/poRIFqN7YT1ESl4Wmu8gwkCQ6znO/+jyxDoHrigjTda FWNhmP3KZF60RAE2C6WfswxPHd0/Gn/6CvEjDezhkzpM2jP68xcDptylYntQXgdNK67R pulNfKrjiII6GbCyy9t381DUmI1c8d8xfbCYANSAJGhhg/fqoTDNjI+7qYS83iaj/amI 8eQYHgvmpydmtMJ9yvtlcuz8sm4tJR/wPioPhVFaBHOGxezGB68YxOcgjeERqDS9Yoq8 A6Vw== X-Gm-Message-State: AKwxytfJbs1Fj6034pkG4c2+WvAKDWGDEWAKu/s/gjZ2Na2odJEECUWJ Wgr+fbfiYN+kPzsQ/ALpc40= X-Received: by 10.99.123.91 with SMTP id k27mr30500377pgn.179.1516390875537; Fri, 19 Jan 2018 11:41:15 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([2620:0:1000:1611:da80:8749:c06f:9515]) by smtp.gmail.com with ESMTPSA id p1sm18947830pgr.44.2018.01.19.11.41.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2018 11:41:15 -0800 (PST) From: Dmitry Torokhov To: Benjamin Tissoires , Hans de Goede , Lyude Paul Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] Input: libps2 - fix switch statement formatting Date: Fri, 19 Jan 2018 11:41:05 -0800 Message-Id: <20180119194111.185590-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog In-Reply-To: <20180119194111.185590-1-dmitry.torokhov@gmail.com> References: <20180119194111.185590-1-dmitry.torokhov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Individual labels of switch statements should have the same indentation level as the switch statement itself. Signed-off-by: Dmitry Torokhov --- drivers/input/serio/libps2.c | 131 +++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 66 deletions(-) diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c index 83e9c663aa672..21aea5169a99c 100644 --- a/drivers/input/serio/libps2.c +++ b/drivers/input/serio/libps2.c @@ -126,46 +126,46 @@ EXPORT_SYMBOL(ps2_is_keyboard_id); static int ps2_adjust_timeout(struct ps2dev *ps2dev, int command, int timeout) { switch (command) { - case PS2_CMD_RESET_BAT: - /* - * Device has sent the first response byte after - * reset command, reset is thus done, so we can - * shorten the timeout. - * The next byte will come soon (keyboard) or not - * at all (mouse). - */ - if (timeout > msecs_to_jiffies(100)) - timeout = msecs_to_jiffies(100); - break; + case PS2_CMD_RESET_BAT: + /* + * Device has sent the first response byte after + * reset command, reset is thus done, so we can + * shorten the timeout. + * The next byte will come soon (keyboard) or not + * at all (mouse). + */ + if (timeout > msecs_to_jiffies(100)) + timeout = msecs_to_jiffies(100); + break; - case PS2_CMD_GETID: - /* - * Microsoft Natural Elite keyboard responds to - * the GET ID command as it were a mouse, with - * a single byte. Fail the command so atkbd will - * use alternative probe to detect it. - */ - if (ps2dev->cmdbuf[1] == 0xaa) { - serio_pause_rx(ps2dev->serio); - ps2dev->flags = 0; - serio_continue_rx(ps2dev->serio); - timeout = 0; - } - - /* - * If device behind the port is not a keyboard there - * won't be 2nd byte of ID response. - */ - if (!ps2_is_keyboard_id(ps2dev->cmdbuf[1])) { - serio_pause_rx(ps2dev->serio); - ps2dev->flags = ps2dev->cmdcnt = 0; - serio_continue_rx(ps2dev->serio); - timeout = 0; - } - break; + case PS2_CMD_GETID: + /* + * Microsoft Natural Elite keyboard responds to + * the GET ID command as it were a mouse, with + * a single byte. Fail the command so atkbd will + * use alternative probe to detect it. + */ + if (ps2dev->cmdbuf[1] == 0xaa) { + serio_pause_rx(ps2dev->serio); + ps2dev->flags = 0; + serio_continue_rx(ps2dev->serio); + timeout = 0; + } - default: - break; + /* + * If device behind the port is not a keyboard there + * won't be 2nd byte of ID response. + */ + if (!ps2_is_keyboard_id(ps2dev->cmdbuf[1])) { + serio_pause_rx(ps2dev->serio); + ps2dev->flags = ps2dev->cmdcnt = 0; + serio_continue_rx(ps2dev->serio); + timeout = 0; + } + break; + + default: + break; } return timeout; @@ -289,39 +289,38 @@ EXPORT_SYMBOL(ps2_init); int ps2_handle_ack(struct ps2dev *ps2dev, unsigned char data) { switch (data) { - case PS2_RET_ACK: - ps2dev->nak = 0; + case PS2_RET_ACK: + ps2dev->nak = 0; + break; + + case PS2_RET_NAK: + ps2dev->flags |= PS2_FLAG_NAK; + ps2dev->nak = PS2_RET_NAK; + break; + + case PS2_RET_ERR: + if (ps2dev->flags & PS2_FLAG_NAK) { + ps2dev->flags &= ~PS2_FLAG_NAK; + ps2dev->nak = PS2_RET_ERR; break; + } - case PS2_RET_NAK: - ps2dev->flags |= PS2_FLAG_NAK; - ps2dev->nak = PS2_RET_NAK; + /* + * Workaround for mice which don't ACK the Get ID command. + * These are valid mouse IDs that we recognize. + */ + case 0x00: + case 0x03: + case 0x04: + if (ps2dev->flags & PS2_FLAG_WAITID) { + ps2dev->nak = 0; break; - - case PS2_RET_ERR: - if (ps2dev->flags & PS2_FLAG_NAK) { - ps2dev->flags &= ~PS2_FLAG_NAK; - ps2dev->nak = PS2_RET_ERR; - break; - } - - /* - * Workaround for mice which don't ACK the Get ID command. - * These are valid mouse IDs that we recognize. - */ - case 0x00: - case 0x03: - case 0x04: - if (ps2dev->flags & PS2_FLAG_WAITID) { - ps2dev->nak = 0; - break; - } - /* Fall through */ - default: - return 0; + } + /* Fall through */ + default: + return 0; } - if (!ps2dev->nak) { ps2dev->flags &= ~PS2_FLAG_NAK; if (ps2dev->cmdcnt) -- 2.16.0.rc1.238.g530d649a79-goog