2021-08-03 00:43:06

by Salah Triki

Subject: [PATCH] input: touchscreen: replace conditional statement with max()

Replace conditional statement with max() in order to make code cleaner.
Issue found by coccinelle.

Signed-off-by: Salah Triki <[email protected]>
---
drivers/input/touchscreen/usbtouchscreen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 43c521f50c85..69f36d4f6cea 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -269,7 +269,7 @@ static int e2i_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

tmp = tmp - 0xA000;
dev->touch = (tmp > 0);
- dev->press = (tmp > 0 ? tmp : 0);
+ dev->press = max(tmp, 0);

return 1;
}
--
2.25.1

2021-08-04 10:16:14

by Johan Hovold

Subject: Re: [PATCH] input: touchscreen: replace conditional statement with max()

On Tue, Aug 03, 2021 at 01:38:57AM +0100, Salah Triki wrote:
> Replace conditional statement with max() in order to make code cleaner.
> Issue found by coccinelle.
>
> Signed-off-by: Salah Triki <[email protected]>
> ---
> drivers/input/touchscreen/usbtouchscreen.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
> index 43c521f50c85..69f36d4f6cea 100644
> --- a/drivers/input/touchscreen/usbtouchscreen.c
> +++ b/drivers/input/touchscreen/usbtouchscreen.c
> @@ -269,7 +269,7 @@ static int e2i_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
>
> tmp = tmp - 0xA000;
> dev->touch = (tmp > 0);
> - dev->press = (tmp > 0 ? tmp : 0);
> + dev->press = max(tmp, 0);

I'm afraid that like the related patch you've posted elsewhere, this not
an improvement either.

>
> return 1;
> }

Johan