From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f180.google.com (mail-dy1-f180.google.com [74.125.82.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DA9F1A073F for ; Sun, 22 Feb 2026 00:37:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771720650; cv=none; b=QFn08427g3RKjfsmcc94PdK9yBqfl+bHTd1ZkxCeNhXsZ5yFuQdNnAV4Gh1lFZl06J90Ge73Zxgb1Dw2OtI7bnXGh/4AKai9LtMZHtoJOLjFsyIV99rCg5ey5nXsDxu70qVueYEJ55lNZYlzmfocmE3C6dMw+56a/cDVqu9kDBg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771720650; c=relaxed/simple; bh=crb4b82rLxqKn4BkBwvmo2g9i5aBgpOAcm55i7WUJpM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VUA+o3x7lHpLNCkzxdakZc5OeM/J0WTofPd7QwUHJsPoMbWy7OfKzJp2aXwjM0Cvr1jfu5n/DRoE0UMEIoNhrWMQQBN8g13rIsZfWE7BtK8aJUIODd2Bm9rSlarboW8oPm6Y2q9JKkYlZbP5j1yTQjYChdvuabklv7GRGc8Tx5w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RZUiqbir; arc=none smtp.client-ip=74.125.82.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RZUiqbir" Received: by mail-dy1-f180.google.com with SMTP id 5a478bee46e88-2bd3b0bc201so705943eec.1 for ; Sat, 21 Feb 2026 16:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771720648; x=1772325448; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d9P6JIy/yCYueLx7kLL46JzwVZIY5NSAX+sYIu+42/o=; b=RZUiqbiroqd/epQbkoAJ4onrUUrWmoTxF6/LmqH7by3uISQUZTSrMUUmMQwheGnzQj /z/nAjwS/eY5OncOtqu8LDiPzO79HEXwWvDC53OPXkb7bVekPsCL6hhnuCDTBC1XMjtI uX5h4dzXTVsPdv/4D3Dl6cMnEiOsspETaL94XAB5wYwBzRlHKMb/NrPBjBT79uiGjUly mJVDn1ArYA1tdDEIC2U6JhyDG/TDscOlNF8aYhe8F+piJGHVvqyPCWopobFvnJ60RXlU 5eKYclYGkqTCmVaAeKuiBCncvE6DyA7lVdkz9ZiMKbin1FEn8hZ/CbHC1/2npbe2DLbp PC2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771720648; x=1772325448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=d9P6JIy/yCYueLx7kLL46JzwVZIY5NSAX+sYIu+42/o=; b=tn8ZroxMDWHKpzQ2JgttG0YW8XA4WUjiUoXDe4Li1le4jWMfaJKBVxIMHQjcW81csV BY15HoppIynQxCEDz7VGkrpPMR6A+krTf+QvLdxdqNESJ7wvZRidtmhMjt6aRrsPaULB gLS2McxVsrylurR0MJdpG73vG+pNKLug/ZIsehbzDqnFZLwOZKOItss6wJjeYf5doN53 fQsv9B81WGyTdvTFlsNAyArSvvqxKec8wzENyd1oTE01YYAsK8NCbUXqZyrtUu/pkH+K wl813s6+zbfXF/xvcK3nruLwMc1inASDgojc0jsMP+yQZlDLtkFif2mWmV0tfzrCzFoy F7iw== X-Forwarded-Encrypted: i=1; AJvYcCWkL4innLgLSYfEMG7bpZvl9wPHMZqpXuqzKP/s6PuauSW2Xq8xVdfmtPF4OT/LDTqLzmOW0tIUmZMI/K3dNCI=@lists.linux.dev X-Gm-Message-State: AOJu0Yx0n81H5emMuWmx5UcgqYImszLmWhHjbBF8HHgARDMLGfinWdcZ gc1iHEZVNqvrqE5zNFyEy/0bcQCgqUHeEZT4d+CtMobeNam3ueSeB69MvXwxrw== X-Gm-Gg: AZuq6aJB6gYiLM31hmXy3vbyanSM3lhbzH2yQqFyoJ6PmkDvFYkrUJuJLk/LYLK7CUR 2nKmr3yYtPCZ3go1FYUYVCJI6KLtqUyvP+DamuCtXK6KuOQvyTkEc3c+mdMB0ezbNsG1phJLYck umLg0bRuQPOvVDKGGKc4c5bCQAjN98PHmsMDSS8UXp9+aPOswLWTpamTJESAgAqlJbT4rlEUiRU dkyy1AtxPunR6pu4AlhXjqryiWAvTNyJLx63jDiWsZaqW5N1fIC/iiKcm4QmxXltCMrebDyhNEK 7p58bEhLdhVmxrZij+g04yzQkiIycK+gq+AUZ9csfcHBPhA+N5AVpGHw93DCFxiWfrx1AxSvZcw Y9IToPb/sfyOv6L3GDwMEDevKN4x2dCSwiRrbl2mkoLXbj1ICbS6oNRlVkgEtzaXUG+5kZQv8sU AcNFfgnfbtONMIBocwC1fiZhMN5BD5KCH3K1AOB1pWAS9A51N3FBUY+9X/HRETkOB3qNFKvgQjy 24FnlDSZinRIg== X-Received: by 2002:a05:7300:a949:b0:2ba:73db:3e81 with SMTP id 5a478bee46e88-2bd7bd6a424mr1781407eec.33.1771720648229; Sat, 21 Feb 2026 16:37:28 -0800 (PST) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:73d:b075:516c:4a69]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2bd7dc167d3sm2383191eec.24.2026.02.21.16.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Feb 2026 16:37:27 -0800 (PST) From: Dmitry Torokhov To: Fabio Baltieri , Benson Leung Cc: Guenter Roeck , Simon Glass , Tzung-Bi Shih , linux-input@vger.kernel.org, chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] Input: cros_ec_keyb - simplify cros_ec_keyb_work() Date: Sat, 21 Feb 2026 16:37:13 -0800 Message-ID: <20260222003717.471977-5-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.53.0.345.g96ddfc5eaa-goog In-Reply-To: <20260222003717.471977-1-dmitry.torokhov@gmail.com> References: <20260222003717.471977-1-dmitry.torokhov@gmail.com> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Introduce temporaries for event_data pointer and event_size to simplify the code a bit. In cros_ec_keyb_compute_valid_keys() explicitly compare with KEY_RESERVED to make the intent of the comparison more clear. Signed-off-by: Dmitry Torokhov --- drivers/input/keyboard/cros_ec_keyb.c | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c index fabbdbc22785..1b4ee30e1998 100644 --- a/drivers/input/keyboard/cros_ec_keyb.c +++ b/drivers/input/keyboard/cros_ec_keyb.c @@ -330,8 +330,10 @@ static int cros_ec_keyb_work(struct notifier_block *nb, { struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb, notifier); - u32 val; + struct ec_response_get_next_event_v3 *event_data; + unsigned int event_size; unsigned int ev_type; + u32 val; /* * If not wake enabled, discard key state changes during @@ -341,32 +343,32 @@ static int cros_ec_keyb_work(struct notifier_block *nb, if (queued_during_suspend && !device_may_wakeup(ckdev->dev)) return NOTIFY_OK; - switch (ckdev->ec->event_data.event_type) { + event_data = &ckdev->ec->event_data; + event_size = ckdev->ec->event_size; + + switch (event_data->event_type) { case EC_MKBP_EVENT_KEY_MATRIX: pm_wakeup_event(ckdev->dev, 0); if (!ckdev->idev) { - dev_warn_once(ckdev->dev, - "Unexpected key matrix event\n"); + dev_warn_once(ckdev->dev, "Unexpected key matrix event\n"); return NOTIFY_OK; } - if (ckdev->ec->event_size != ckdev->cols) { + if (event_size != ckdev->cols) { dev_err(ckdev->dev, "Discarded key matrix event, unexpected length: %d != %d\n", ckdev->ec->event_size, ckdev->cols); return NOTIFY_OK; } - cros_ec_keyb_process(ckdev, - ckdev->ec->event_data.data.key_matrix, - ckdev->ec->event_size); + cros_ec_keyb_process(ckdev, event_data->data.key_matrix, event_size); break; case EC_MKBP_EVENT_SYSRQ: pm_wakeup_event(ckdev->dev, 0); - val = get_unaligned_le32(&ckdev->ec->event_data.data.sysrq); + val = get_unaligned_le32(&event_data->data.sysrq); dev_dbg(ckdev->dev, "sysrq code from EC: %#x\n", val); handle_sysrq(val); break; @@ -376,12 +378,10 @@ static int cros_ec_keyb_work(struct notifier_block *nb, pm_wakeup_event(ckdev->dev, 0); if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) { - val = get_unaligned_le32( - &ckdev->ec->event_data.data.buttons); + val = get_unaligned_le32(&event_data->data.buttons); ev_type = EV_KEY; } else { - val = get_unaligned_le32( - &ckdev->ec->event_data.data.switches); + val = get_unaligned_le32(&event_data->data.switches); ev_type = EV_SW; } cros_ec_keyb_report_bs(ckdev, ev_type, val); @@ -410,7 +410,7 @@ static void cros_ec_keyb_compute_valid_keys(struct cros_ec_keyb *ckdev) for (col = 0; col < ckdev->cols; col++) { for (row = 0; row < ckdev->rows; row++) { code = keymap[MATRIX_SCAN_CODE(row, col, row_shift)]; - if (code && (code != KEY_BATTERY)) + if (code != KEY_RESERVED && code != KEY_BATTERY) ckdev->valid_keys[col] |= BIT(row); } dev_dbg(ckdev->dev, "valid_keys[%02d] = 0x%02x\n", -- 2.53.0.345.g96ddfc5eaa-goog