From nobody Mon Jun 8 14:35:53 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 961A1331A6D for ; Thu, 28 May 2026 23:56:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780012579; cv=none; b=igllpqPg9EOJrtTkzAYc1C4Eu+9obD7feV1k464ptudUA8OmyzzI0ES2BXJ1HmeB2cqFf9sI/cXM3ro/+7D2BzQPjmAmHuTJnSf/KSQ923Ckk8RVF5MU6xWOSoKujb9Nqt+7kE3xFS2zhSAWYBJD2R8zEIdT1NlJttqL64UGGZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780012579; c=relaxed/simple; bh=AcXlsSOi3A26090BSV94lwQgs+NIh3bx3C/0rXz1gAY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mawMazTB05140w2hjXbTk6jlL9KI/GOZMjCnGufswJVD5x/Y4sKdarh4qk/b88+ZUE/6CatHJFfrtua0AjQOqcfJy0IBO45gmU4lYfZzHctFDmFC/GlroIOTG9GUo6f/3vavUKtuMqklXxa9FxcCNMyXTe7lkb8nAJQt4gn5/0c= 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=cKVzdfER; arc=none smtp.client-ip=209.85.214.171 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="cKVzdfER" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2bf1f074a12so2049065ad.0 for ; Thu, 28 May 2026 16:56:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780012577; x=1780617377; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bdkMSexsyMB1hw8szrf3taKS9p1kvVYpBmWW3eaAw/8=; b=cKVzdfERdr8gGIJHrWKwMtO5zrtH7parTuPE/0nr8Q5rVjzZl0hdW9TZ8mVF5mVoBQ rUGL+jIkiBQfSvXdKYjGcU7wLgapZUK3cA5kyT46z2IcbzqPlkewHgVFN8oD8hKjdOac edOE1CNiiT36BH8GyEqIe0yGPYxD+fuocOZdJM4ffG7yfM30Ubeoa5Pa+Tgq2W6klek8 pEs8vLfO3MdwUq18/+3xHznkQJH9NtZ5EkJB71J3YlTEpSbuDUxoe8gdBBwEV4WrYph+ YCzP8S+yjEuS4rn4jjObCQfU6WOKxT61orHsWburZKG8PVyCudSo1pZTDWNfcVQy21XX 6auQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780012577; x=1780617377; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bdkMSexsyMB1hw8szrf3taKS9p1kvVYpBmWW3eaAw/8=; b=F3KTxJSvXo4XjfkqR1g+3j90om9uPgmy0ixxhFLWGvgZIGwfLNta9hwWHmtQbsBHjj 1FmoyHRqW2zlOPO8utBXc2wuDlLA6Ik5WKkpNhhiXBdpwVA0q8p8KJzLeHfyMjWKj3qc fv4VfgiKN6+h6JInobRJ9SSb7rZN8BfWYY2ZhCvhFXWa+tk9Mgjxm554G8XRWxwYA/oi 91GWiq43YkO8+ci0HSbGw1+vT5gTs/a2o9uO1sGfWCZEiqfyce+F18yySTjYAa+QpiCX +LZ+dKn7E3ssISqs5JZvKlgBdHA8GokCUNhz+8AvDr7dbd4P6kXFrrpX28mDU0HytTkH Y2/g== X-Forwarded-Encrypted: i=1; AFNElJ9UOixw7kT6xBaveQFmJ+llkRfTfkR7N0UgRb5lriUtW2dQpFC65QAHXNMiPXmma5O0CD+E23aZ896jk8E=@vger.kernel.org X-Gm-Message-State: AOJu0YwgcEes/FKo69sqV5rxw/zJ+4wDwoMDQDHxxbNziaINFtftFm4S 4uVIlht0fWYdOBBBDBtVF4eTgNF4IOVyBgAEsYDOJy0c+fejKR1uY7VG X-Gm-Gg: Acq92OF8teITzbtMGpUeQvdnqJLVjguaGVAjbZLKS5QYv4uW6io05pKBPiK9G9+VBm8 N6my1t02FAwEbDN9feNMZ0Q7SCiF/Sl2wuLxwBP52neA8I5hhQAWzffP9hLAYSYQdro3/QCm9IY 1nR8psLRdqXJrqJPPdTsgtfShnpH5+kZJn5QyYMRz4Ip+7LVWG/gF4AsE2EGb1Z2teXryu8FahE GZ21RMikMkhDeQRLGwruLEniCzPgF+cF+i6kvwPpwcv1EkXJSQv33z8VdwERw0yMVn0Mj8LnBPX 6/imt0DFAIjUEf506AYKfIctzNz3S7WU1tOTAPqn27faWl+g2RoEb5cM+u5tFq9cuFBLsUZoDs4 /sk0+c8dz4/BAZVRUv1G1GD3uuQeFa/0SP2jnX3GWoPA55wmjWwXbpf959P6SGe0tYReJH3na0F 55PPEGlUQ4tMZPz/nDzuw44O938HSgtTVUBZJPbFbfnR9wpj7pcHN41UtX9J6XqHQ1hJinICxbP zlySmYLhBR/kR6Qemw0O+4cgARe/vUKcQghELOOU4nresNy6us/7p8Q X-Received: by 2002:a17:902:d2c9:b0:2ae:55eb:f82d with SMTP id d9443c01a7336-2bf2051107cmr7138865ad.1.1780012577571; Thu, 28 May 2026 16:56:17 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bf21e2b72dsm1543595ad.69.2026.05.28.16.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2026 16:56:17 -0700 (PDT) From: Rosen Penev To: linux-input@vger.kernel.org Cc: Dmitry Torokhov , Matthias Brugger , AngeloGioacchino Del Regno , linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH] Input: mtk-pmic-keys: Count available keys during probe instead of pre-counting Date: Thu, 28 May 2026 16:56:00 -0700 Message-ID: <20260528235600.312045-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace the separate of_get_available_child_count() pre-count and validation step with a single pass through for_each_child_of_node_scoped(). Skip unavailable child nodes and bail out if more than MTK_PMIC_MAX_KEY_COUNT available keys are found. Set nkeys after the loop so suspend/resume iterate only over initialized entries. Also use a key variable in the loop for clarity. Use of_device_get_match_data() to fetch the PMIC key register data directly instead of open-coding an of_match_device() lookup. This also lets the driver drop the of_device.h include. Assisted-by: OpenCode:BigPickle Signed-off-by: Rosen Penev --- drivers/input/keyboard/mtk-pmic-keys.c | 53 ++++++++++++-------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboar= d/mtk-pmic-keys.c index c78d9f6d97c4..e34856693ee2 100644 --- a/drivers/input/keyboard/mtk-pmic-keys.c +++ b/drivers/input/keyboard/mtk-pmic-keys.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -147,6 +146,7 @@ struct mtk_pmic_keys { struct input_dev *input_dev; struct device *dev; struct regmap *regmap; + unsigned int nkeys; struct mtk_pmic_keys_info keys[MTK_PMIC_MAX_KEY_COUNT]; }; =20 @@ -267,7 +267,7 @@ static int mtk_pmic_keys_suspend(struct device *dev) struct mtk_pmic_keys *keys =3D dev_get_drvdata(dev); int index; =20 - for (index =3D 0; index < MTK_PMIC_MAX_KEY_COUNT; index++) { + for (index =3D 0; index < keys->nkeys; index++) { if (keys->keys[index].wakeup) { enable_irq_wake(keys->keys[index].irq); if (keys->keys[index].irq_r > 0) @@ -283,7 +283,7 @@ static int mtk_pmic_keys_resume(struct device *dev) struct mtk_pmic_keys *keys =3D dev_get_drvdata(dev); int index; =20 - for (index =3D 0; index < MTK_PMIC_MAX_KEY_COUNT; index++) { + for (index =3D 0; index < keys->nkeys; index++) { if (keys->keys[index].wakeup) { disable_irq_wake(keys->keys[index].irq); if (keys->keys[index].irq_r > 0) @@ -325,24 +325,23 @@ MODULE_DEVICE_TABLE(of, of_mtk_pmic_keys_match_tbl); static int mtk_pmic_keys_probe(struct platform_device *pdev) { int error, index =3D 0; - unsigned int keycount; struct mt6397_chip *pmic_chip =3D dev_get_drvdata(pdev->dev.parent); struct device_node *node =3D pdev->dev.of_node; static const char *const irqnames[] =3D { "powerkey", "homekey" }; static const char *const irqnames_r[] =3D { "powerkey_r", "homekey_r" }; struct mtk_pmic_keys *keys; const struct mtk_pmic_regs *mtk_pmic_regs; + struct mtk_pmic_keys_info *key; struct input_dev *input_dev; - const struct of_device_id *of_id =3D - of_match_device(of_mtk_pmic_keys_match_tbl, &pdev->dev); =20 keys =3D devm_kzalloc(&pdev->dev, sizeof(*keys), GFP_KERNEL); if (!keys) return -ENOMEM; - keys->dev =3D &pdev->dev; keys->regmap =3D pmic_chip->regmap; - mtk_pmic_regs =3D of_id->data; + mtk_pmic_regs =3D of_device_get_match_data(&pdev->dev); + if (!mtk_pmic_regs) + return -EINVAL; =20 keys->input_dev =3D input_dev =3D devm_input_allocate_device(keys->dev); if (!input_dev) { @@ -356,31 +355,26 @@ static int mtk_pmic_keys_probe(struct platform_device= *pdev) input_dev->id.product =3D 0x0001; input_dev->id.version =3D 0x0001; =20 - keycount =3D of_get_available_child_count(node); - if (keycount > MTK_PMIC_MAX_KEY_COUNT || - keycount > ARRAY_SIZE(irqnames)) { - dev_err(keys->dev, "too many keys defined (%d)\n", keycount); - return -EINVAL; - } + for_each_available_child_of_node_scoped(node, child) { + if (index >=3D MTK_PMIC_MAX_KEY_COUNT) { + dev_err(&pdev->dev, "too many keys defined\n"); + return -EINVAL; + } =20 - for_each_child_of_node_scoped(node, child) { - keys->keys[index].regs =3D &mtk_pmic_regs->keys_regs[index]; + key =3D &keys->keys[index]; + key->regs =3D &mtk_pmic_regs->keys_regs[index]; =20 - keys->keys[index].irq =3D - platform_get_irq_byname(pdev, irqnames[index]); - if (keys->keys[index].irq < 0) - return keys->keys[index].irq; + key->irq =3D platform_get_irq_byname(pdev, irqnames[index]); + if (key->irq < 0) + return key->irq; =20 if (mtk_pmic_regs->key_release_irq) { - keys->keys[index].irq_r =3D platform_get_irq_byname(pdev, - irqnames_r[index]); - - if (keys->keys[index].irq_r < 0) - return keys->keys[index].irq_r; + key->irq_r =3D platform_get_irq_byname(pdev, irqnames_r[index]); + if (key->irq_r < 0) + return key->irq_r; } =20 - error =3D of_property_read_u32(child, - "linux,keycodes", &keys->keys[index].keycode); + error =3D of_property_read_u32(child, "linux,keycodes", &key->keycode); if (error) { dev_err(keys->dev, "failed to read key:%d linux,keycode property: %d\n", @@ -389,14 +383,15 @@ static int mtk_pmic_keys_probe(struct platform_device= *pdev) } =20 if (of_property_read_bool(child, "wakeup-source")) - keys->keys[index].wakeup =3D true; + key->wakeup =3D true; =20 - error =3D mtk_pmic_key_setup(keys, &keys->keys[index]); + error =3D mtk_pmic_key_setup(keys, key); if (error) return error; =20 index++; } + keys->nkeys =3D index; =20 error =3D input_register_device(input_dev); if (error) { --=20 2.54.0