2015-06-10 16:32:25

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] Input: cyttsp4 - use swap() in cyttsp4_get_touch()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/input/touchscreen/cyttsp4_core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
index 568a3d3..5ed3105 100644
--- a/drivers/input/touchscreen/cyttsp4_core.c
+++ b/drivers/input/touchscreen/cyttsp4_core.c
@@ -775,7 +775,6 @@ static void cyttsp4_get_touch(struct cyttsp4_mt_data *md,
struct device *dev = &md->input->dev;
struct cyttsp4_sysinfo *si = md->si;
enum cyttsp4_tch_abs abs;
- int tmp;
bool flipped;

for (abs = CY_TCH_X; abs < CY_TCH_NUM_ABS; abs++) {
@@ -790,9 +789,7 @@ static void cyttsp4_get_touch(struct cyttsp4_mt_data *md,
}

if (md->pdata->flags & CY_FLAG_FLIP) {
- tmp = touch->abs[CY_TCH_X];
- touch->abs[CY_TCH_X] = touch->abs[CY_TCH_Y];
- touch->abs[CY_TCH_Y] = tmp;
+ swap(touch->abs[CY_TCH_X], touch->abs[CY_TCH_Y]);
flipped = true;
} else
flipped = false;
--
2.4.2

2015-06-11 20:22:25

by Dmitry Torokhov

Subject: Re: [PATCH 1/1 linux-next] Input: cyttsp4 - use swap() in cyttsp4_get_touch()

On Wed, Jun 10, 2015 at 06:31:43PM +0200, Fabian Frederick wrote:
> Use kernel.h macro definition.
>
> Thanks to Julia Lawall for Coccinelle scripting support.
>
> Signed-off-by: Fabian Frederick <[email protected]>

Applied, thank you.

> ---
> drivers/input/touchscreen/cyttsp4_core.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
> index 568a3d3..5ed3105 100644
> --- a/drivers/input/touchscreen/cyttsp4_core.c
> +++ b/drivers/input/touchscreen/cyttsp4_core.c
> @@ -775,7 +775,6 @@ static void cyttsp4_get_touch(struct cyttsp4_mt_data *md,
> struct device *dev = &md->input->dev;
> struct cyttsp4_sysinfo *si = md->si;
> enum cyttsp4_tch_abs abs;
> - int tmp;
> bool flipped;
>
> for (abs = CY_TCH_X; abs < CY_TCH_NUM_ABS; abs++) {
> @@ -790,9 +789,7 @@ static void cyttsp4_get_touch(struct cyttsp4_mt_data *md,
> }
>
> if (md->pdata->flags & CY_FLAG_FLIP) {
> - tmp = touch->abs[CY_TCH_X];
> - touch->abs[CY_TCH_X] = touch->abs[CY_TCH_Y];
> - touch->abs[CY_TCH_Y] = tmp;
> + swap(touch->abs[CY_TCH_X], touch->abs[CY_TCH_Y]);
> flipped = true;
> } else
> flipped = false;
> --
> 2.4.2
>