[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <97764bad-7091-e9ed-6f49-d31861fc622f@linux.intel.com>
Date: Fri, 11 Aug 2023 16:17:41 +0300 (EEST)
From: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
To: Arnd Bergmann <arnd@...nel.org>
cc: Hans de Goede <hdegoede@...hat.com>,
Mark Gross <markgross@...nel.org>,
"xingtong.wu" <xingtong.wu@...mens.com>,
Arnd Bergmann <arnd@...db.de>,
Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Tom Rix <trix@...hat.com>,
Henning Schild <henning.schild@...mens.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Lee Jones <lee@...nel.org>,
platform-driver-x86@...r.kernel.org, linux-kernel@...r.kernel.org,
llvm@...ts.linux.dev
Subject: Re: [PATCH] platform/x86/siemens: simatic-ipc: fix nonsensical
condition
On Fri, 11 Aug 2023, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@...db.de>
>
> The condition checking for a constant SIMATIC_IPC_DEVICE_BX_59A value
> clearly makes no sense, as clang warns:
>
> drivers/platform/x86/siemens/simatic-ipc.c:132:42: error: use of logical '||' with constant operand [-Werror,-Wconstant-logical-operand]
> if (ledmode == SIMATIC_IPC_DEVICE_227G || SIMATIC_IPC_DEVICE_BX_59A)
> ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/platform/x86/siemens/simatic-ipc-batt.c:197:49: error: use of logical '||' with constant operand [-Werror,-Wconstant-logical-operand]
> if (priv.devmode == SIMATIC_IPC_DEVICE_BX_21A || SIMATIC_IPC_DEVICE_BX_59A)
> ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Most likely, this was meant to check ledmode to be one of the two values,
> so change it to that.
>
> Fixes: b8af77951941e ("platform/x86/siemens: simatic-ipc: add new models BX-56A/BX-59A")
> Fixes: c56beff203754 ("platform/x86/siemens: simatic-ipc-batt: add support for module BX-59A")
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
> drivers/platform/x86/siemens/simatic-ipc-batt.c | 3 ++-
> drivers/platform/x86/siemens/simatic-ipc.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt.c b/drivers/platform/x86/siemens/simatic-ipc-batt.c
> index d66b9969234bf..e6c12c52843ca 100644
> --- a/drivers/platform/x86/siemens/simatic-ipc-batt.c
> +++ b/drivers/platform/x86/siemens/simatic-ipc-batt.c
> @@ -194,7 +194,8 @@ int simatic_ipc_batt_probe(struct platform_device *pdev, struct gpiod_lookup_tab
>
> if (table->table[2].key) {
> flags = GPIOD_OUT_HIGH;
> - if (priv.devmode == SIMATIC_IPC_DEVICE_BX_21A || SIMATIC_IPC_DEVICE_BX_59A)
> + if (priv.devmode == SIMATIC_IPC_DEVICE_BX_21A ||
> + priv.devmode == SIMATIC_IPC_DEVICE_BX_59A)
> flags = GPIOD_OUT_LOW;
> priv.gpios[2] = devm_gpiod_get_index(dev, "CMOSBattery meter", 2, flags);
> if (IS_ERR(priv.gpios[2])) {
> diff --git a/drivers/platform/x86/siemens/simatic-ipc.c b/drivers/platform/x86/siemens/simatic-ipc.c
> index 02c540cf40702..e11d28ffac604 100644
> --- a/drivers/platform/x86/siemens/simatic-ipc.c
> +++ b/drivers/platform/x86/siemens/simatic-ipc.c
> @@ -129,7 +129,8 @@ static int register_platform_devices(u32 station_id)
> pdevname = KBUILD_MODNAME "_leds";
> if (ledmode == SIMATIC_IPC_DEVICE_127E)
> pdevname = KBUILD_MODNAME "_leds_gpio_apollolake";
> - if (ledmode == SIMATIC_IPC_DEVICE_227G || SIMATIC_IPC_DEVICE_BX_59A)
> + if (ledmode == SIMATIC_IPC_DEVICE_227G ||
> + ledmode == SIMATIC_IPC_DEVICE_BX_59A)
> pdevname = KBUILD_MODNAME "_leds_gpio_f7188x";
> if (ledmode == SIMATIC_IPC_DEVICE_BX_21A)
> pdevname = KBUILD_MODNAME "_leds_gpio_elkhartlake";
Thank you for the patch but these are already fixed by commits:
7abf253afa5c ("platform/x86/siemens: simatic-ipc-batt: fix logical error for BX-59A")
b01c1e022f7f ("platform/x86/siemens: simatic-ipc: fix logical error for BX-59A")
--
i.
Powered by blists - more mailing lists