| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251113143028.GJ1949330@google.com>
Date: Thu, 13 Nov 2025 14:30:28 +0000
From: Lee Jones <lee@...nel.org>
To: Alexander Kurz <akurz@...la.de>
Cc: Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Dzmitry Sankouski <dsankouski@...il.com>,
Griffin Kroah-Hartman <griffin.kroah@...rphone.com>,
Mathieu Dubois-Briand <mathieu.dubois-briand@...tlin.com>,
Heiko Stuebner <heiko@...ech.de>,
"Dr . David Alan Gilbert" <linux@...blig.org>,
Job Sava <jsava@...ticallink.com>,
Alexandre Belloni <alexandre.belloni@...tlin.com>,
Uwe Kleine-König <u.kleine-koenig@...libre.com>,
devicetree@...r.kernel.org, imx@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-input@...r.kernel.org
Subject: Re: [PATCH v7 3/6] Input: mc13783-pwrbutton: convert pdata members
to array
On Fri, 31 Oct 2025, Alexander Kurz wrote:
> 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 <akurz@...la.de>
> ---
> drivers/input/misc/mc13783-pwrbutton.c | 42 +++++++++++++-------------
> include/linux/mfd/mc13xxx.h | 8 ++---
Acked-by: Lee Jones <lee@...nel.org>
> 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
>
--
Lee Jones [李琼斯]
Powered by blists - more mailing lists