2015-06-10 16:39:47

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] HID: use swap() in cp_report_fixup()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

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

diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c
index c4ef3bc..1b764d1 100644
--- a/drivers/hid/hid-cypress.c
+++ b/drivers/hid/hid-cypress.c
@@ -41,13 +41,9 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc,

for (i = 0; i < *rsize - 4; i++)
if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) {
- __u8 tmp;
-
rdesc[i] = 0x19;
rdesc[i + 2] = 0x29;
- tmp = rdesc[i + 3];
- rdesc[i + 3] = rdesc[i + 1];
- rdesc[i + 1] = tmp;
+ swap(rdesc[i + 3], rdesc[i + 1]);
}
return rdesc;
}
--
2.4.2

2015-06-18 09:01:57

by Jiri Kosina

Subject: Re: [PATCH 1/1 linux-next] HID: use swap() in cp_report_fixup()

On Wed, 10 Jun 2015, Fabian Frederick wrote:

> Use kernel.h macro definition.
>
> Thanks to Julia Lawall for Coccinelle scripting support.
>
> Signed-off-by: Fabian Frederick <[email protected]>

Applied to for-4.2/upstream. Thanks.

> ---
> drivers/hid/hid-cypress.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c
> index c4ef3bc..1b764d1 100644
> --- a/drivers/hid/hid-cypress.c
> +++ b/drivers/hid/hid-cypress.c
> @@ -41,13 +41,9 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc,
>
> for (i = 0; i < *rsize - 4; i++)
> if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) {
> - __u8 tmp;
> -
> rdesc[i] = 0x19;
> rdesc[i + 2] = 0x29;
> - tmp = rdesc[i + 3];
> - rdesc[i + 3] = rdesc[i + 1];
> - rdesc[i + 1] = tmp;
> + swap(rdesc[i + 3], rdesc[i + 1]);
> }
> return rdesc;
> }

--
Jiri Kosina
SUSE Labs