2015-06-10 16:37:39

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] hwmon: (w83627ehf) use swap() in w82627ehf_swap_tempreg()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/hwmon/w83627ehf.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index b10353b..697007a 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1937,27 +1937,11 @@ static inline void w83627ehf_init_device(struct w83627ehf_data *data,
static void w82627ehf_swap_tempreg(struct w83627ehf_data *data,
int r1, int r2)
{
- u16 tmp;
-
- tmp = data->temp_src[r1];
- data->temp_src[r1] = data->temp_src[r2];
- data->temp_src[r2] = tmp;
-
- tmp = data->reg_temp[r1];
- data->reg_temp[r1] = data->reg_temp[r2];
- data->reg_temp[r2] = tmp;
-
- tmp = data->reg_temp_over[r1];
- data->reg_temp_over[r1] = data->reg_temp_over[r2];
- data->reg_temp_over[r2] = tmp;
-
- tmp = data->reg_temp_hyst[r1];
- data->reg_temp_hyst[r1] = data->reg_temp_hyst[r2];
- data->reg_temp_hyst[r2] = tmp;
-
- tmp = data->reg_temp_config[r1];
- data->reg_temp_config[r1] = data->reg_temp_config[r2];
- data->reg_temp_config[r2] = tmp;
+ swap(data->temp_src[r1], data->temp_src[r2]);
+ swap(data->reg_temp[r1], data->reg_temp[r2]);
+ swap(data->reg_temp_over[r1], data->reg_temp_over[r2]);
+ swap(data->reg_temp_hyst[r1], data->reg_temp_hyst[r2]);
+ swap(data->reg_temp_config[r1], data->reg_temp_config[r2]);
}

static void
--
2.4.2

2015-06-11 08:12:05

by Jean Delvare

Subject: Re: [PATCH 1/1 linux-next] hwmon: (w83627ehf) use swap() in w82627ehf_swap_tempreg()

On Wed, 10 Jun 2015 18:33:01 +0200, Fabian Frederick wrote:
> Use kernel.h macro definition.
>
> Thanks to Julia Lawall for Coccinelle scripting support.
>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> drivers/hwmon/w83627ehf.c | 26 +++++---------------------
> 1 file changed, 5 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
> index b10353b..697007a 100644
> --- a/drivers/hwmon/w83627ehf.c
> +++ b/drivers/hwmon/w83627ehf.c
> @@ -1937,27 +1937,11 @@ static inline void w83627ehf_init_device(struct w83627ehf_data *data,
> static void w82627ehf_swap_tempreg(struct w83627ehf_data *data,
> int r1, int r2)
> {
> - u16 tmp;
> -
> - tmp = data->temp_src[r1];
> - data->temp_src[r1] = data->temp_src[r2];
> - data->temp_src[r2] = tmp;
> -
> - tmp = data->reg_temp[r1];
> - data->reg_temp[r1] = data->reg_temp[r2];
> - data->reg_temp[r2] = tmp;
> -
> - tmp = data->reg_temp_over[r1];
> - data->reg_temp_over[r1] = data->reg_temp_over[r2];
> - data->reg_temp_over[r2] = tmp;
> -
> - tmp = data->reg_temp_hyst[r1];
> - data->reg_temp_hyst[r1] = data->reg_temp_hyst[r2];
> - data->reg_temp_hyst[r2] = tmp;
> -
> - tmp = data->reg_temp_config[r1];
> - data->reg_temp_config[r1] = data->reg_temp_config[r2];
> - data->reg_temp_config[r2] = tmp;
> + swap(data->temp_src[r1], data->temp_src[r2]);
> + swap(data->reg_temp[r1], data->reg_temp[r2]);
> + swap(data->reg_temp_over[r1], data->reg_temp_over[r2]);
> + swap(data->reg_temp_hyst[r1], data->reg_temp_hyst[r2]);
> + swap(data->reg_temp_config[r1], data->reg_temp_config[r2]);
> }
>
> static void

Looks good. Applied, thanks.

--
Jean Delvare
SUSE L3 Support