From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from vs81.iboxed.net (vs10.datenmanufaktur-hosting.net [213.160.73.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 265E22E92B7; Wed, 8 Oct 2025 06:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.160.73.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759905938; cv=none; b=aqQzrkYvvg+Jw4AwYyBJgX9V/Sneh6qvRuo6m4sh0cXNtNCrmzrbqZOBTOhIknZ06MlbIZuPwznhyuSBvYU2CvSLx8m8P+i+JcgtIknPR6hzCgUxAshIQ3WQVj3/SDdDsJPL1YsWpoMevQLlX5/tLcdyPXAA2qNiZHoy7lUftZI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759905938; c=relaxed/simple; bh=f3nk6RtA5IYDVa82v6LnaN3lzAk1OrTgcNHp4zY+tDk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GsuZ+vVMBSGf8I+Totq1en4+2Tuw1aTgpTH1ipnrlegLMhabPHzuBetYiv95MlnbIu8NJYczUE5eyEzF9IQL1H6Go0DIJVtD7ta3EdXlGUKDginHXyld718ZQvB2JXPYu3iQX1dS9I2v6ZQAP9Dfph+lo1qGggCEbPkbYIwvZuY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blala.de; spf=pass smtp.mailfrom=blala.de; arc=none smtp.client-ip=213.160.73.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blala.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=blala.de Received: from blala.de (localhost [127.0.0.1]) by vs81.iboxed.net (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 5986i3Sv013930; Wed, 8 Oct 2025 06:44:03 GMT Received: (from akurz@localhost) by blala.de (8.15.2/8.15.2/Submit) id 5986i3gu013926; Wed, 8 Oct 2025 06:44:03 GMT From: Alexander Kurz To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Torokhov , Dzmitry Sankouski , "Dr. David Alan Gilbert" , Heiko Stuebner , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexander Kurz Subject: [PATCH v5 3/5] Input: mc13783-pwrbutton: convert pdata members to array Date: Wed, 8 Oct 2025 06:43:59 +0000 Message-Id: <20251008064401.13863-4-akurz@blala.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20251008064401.13863-1-akurz@blala.de> References: <20251008064401.13863-1-akurz@blala.de> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit As preparation for the extension of support for all three mc13xxx variants, convert the members of mc13xxx_buttons_platform_data to arrays to allow index access within the next commit. Signed-off-by: Alexander Kurz --- drivers/input/misc/mc13783-pwrbutton.c | 42 +++++++++++++------------- include/linux/mfd/mc13xxx.h | 8 ++--- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c index 20f68aab6edf..2ee115d77b1c 100644 --- a/drivers/input/misc/mc13783-pwrbutton.c +++ b/drivers/input/misc/mc13783-pwrbutton.c @@ -108,24 +108,24 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - reg |= (pdata->b1on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC; - reg |= (pdata->b2on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC; - reg |= (pdata->b3on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON3BDBNC; + reg |= (pdata->b_on_flags[0] & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC; + reg |= (pdata->b_on_flags[1] & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC; + reg |= (pdata->b_on_flags[2] & 0x3) << MC13783_POWER_CONTROL_2_ON3BDBNC; priv->pwr = pwr; priv->mc13783 = mc13783; mc13xxx_lock(mc13783); - if (pdata->b1on_flags & MC13783_BUTTON_ENABLE) { - priv->keymap[0] = pdata->b1on_key; - if (pdata->b1on_key != KEY_RESERVED) - __set_bit(pdata->b1on_key, pwr->keybit); + if (pdata->b_on_flags[0] & MC13783_BUTTON_ENABLE) { + priv->keymap[0] = pdata->b_on_key[0]; + if (pdata->b_on_key[0] != KEY_RESERVED) + __set_bit(pdata->b_on_key[0], pwr->keybit); - if (pdata->b1on_flags & MC13783_BUTTON_POL_INVERT) + if (pdata->b_on_flags[0] & MC13783_BUTTON_POL_INVERT) priv->flags |= MC13783_PWRB_B1_POL_INVERT; - if (pdata->b1on_flags & MC13783_BUTTON_RESET_EN) + if (pdata->b_on_flags[0] & MC13783_BUTTON_RESET_EN) reg |= MC13783_POWER_CONTROL_2_ON1BRSTEN; irq = platform_get_irq_byname(pdev, "b1on"); @@ -144,15 +144,15 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev) priv->irq[0] = irq; } - if (pdata->b2on_flags & MC13783_BUTTON_ENABLE) { - priv->keymap[1] = pdata->b2on_key; - if (pdata->b2on_key != KEY_RESERVED) - __set_bit(pdata->b2on_key, pwr->keybit); + if (pdata->b_on_flags[1] & MC13783_BUTTON_ENABLE) { + priv->keymap[1] = pdata->b_on_key[1]; + if (pdata->b_on_key[1] != KEY_RESERVED) + __set_bit(pdata->b_on_key[1], pwr->keybit); - if (pdata->b2on_flags & MC13783_BUTTON_POL_INVERT) + if (pdata->b_on_flags[1] & MC13783_BUTTON_POL_INVERT) priv->flags |= MC13783_PWRB_B2_POL_INVERT; - if (pdata->b2on_flags & MC13783_BUTTON_RESET_EN) + if (pdata->b_on_flags[1] & MC13783_BUTTON_RESET_EN) reg |= MC13783_POWER_CONTROL_2_ON2BRSTEN; irq = platform_get_irq_byname(pdev, "b2on"); @@ -171,15 +171,15 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev) priv->irq[1] = irq; } - if (pdata->b3on_flags & MC13783_BUTTON_ENABLE) { - priv->keymap[2] = pdata->b3on_key; - if (pdata->b3on_key != KEY_RESERVED) - __set_bit(pdata->b3on_key, pwr->keybit); + if (pdata->b_on_flags[2] & MC13783_BUTTON_ENABLE) { + priv->keymap[2] = pdata->b_on_key[2]; + if (pdata->b_on_key[2] != KEY_RESERVED) + __set_bit(pdata->b_on_key[2], pwr->keybit); - if (pdata->b3on_flags & MC13783_BUTTON_POL_INVERT) + if (pdata->b_on_flags[2] & MC13783_BUTTON_POL_INVERT) priv->flags |= MC13783_PWRB_B3_POL_INVERT; - if (pdata->b3on_flags & MC13783_BUTTON_RESET_EN) + if (pdata->b_on_flags[2] & MC13783_BUTTON_RESET_EN) reg |= MC13783_POWER_CONTROL_2_ON3BRSTEN; irq = platform_get_irq_byname(pdev, "b3on"); diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h index dd46fe424a80..4437ab80fcf8 100644 --- a/include/linux/mfd/mc13xxx.h +++ b/include/linux/mfd/mc13xxx.h @@ -181,12 +181,8 @@ struct mc13xxx_leds_platform_data { #define MC13783_BUTTON_RESET_EN (1 << 4) struct mc13xxx_buttons_platform_data { - int b1on_flags; - unsigned short b1on_key; - int b2on_flags; - unsigned short b2on_key; - int b3on_flags; - unsigned short b3on_key; + int b_on_flags[3]; + unsigned int b_on_key[3]; }; #define MC13783_TS_ATO_FIRST false -- 2.39.5