diff mbox series

hwmon: (nct6775) mask out bank number in nct6775_wmi_read_value()

Message ID 20211111025339.27520-1-zev@bewilderbeest.net (mailing list archive)
State Accepted
Headers show
Series hwmon: (nct6775) mask out bank number in nct6775_wmi_read_value() | expand

Commit Message

Zev Weiss Nov. 11, 2021, 2:53 a.m. UTC
The first call to nct6775_asuswmi_read() in nct6775_wmi_read_value()
had been passing the full bank+register number instead of just the
lower 8 bits.  It didn't end up actually causing problems because the
second argument of that function is a u8 anyway, but it seems
preferable to be explicit about it at the call site (and consistent
with the rest of the code).

Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Fixes: 3fbbfc27f955 ("hwmon: (nct6775) Support access via Asus WMI")
---
 drivers/hwmon/nct6775.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andy Shevchenko Nov. 11, 2021, 9:14 a.m. UTC | #1
On Thu, Nov 11, 2021 at 4:53 AM Zev Weiss <zev@bewilderbeest.net> wrote:
>
> The first call to nct6775_asuswmi_read() in nct6775_wmi_read_value()
> had been passing the full bank+register number instead of just the
> lower 8 bits.

>  It didn't end up actually causing problems because the
> second argument of that function is a u8 anyway,

It contradicts the existence of the Fixes tag below. What do you fix then?

> but it seems
> preferable to be explicit about it at the call site (and consistent
> with the rest of the code).

Yeah, in the current state it makes sense.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Later one may refactor this to drop that tons of ' & 0xff':s.

> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
> Fixes: 3fbbfc27f955 ("hwmon: (nct6775) Support access via Asus WMI")
> ---
>  drivers/hwmon/nct6775.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
> index 93dca471972e..57ce8633a725 100644
> --- a/drivers/hwmon/nct6775.c
> +++ b/drivers/hwmon/nct6775.c
> @@ -1527,7 +1527,7 @@ static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
>
>         nct6775_wmi_set_bank(data, reg);
>
> -       err = nct6775_asuswmi_read(data->bank, reg, &tmp);
> +       err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
>         if (err)
>                 return 0;

> 2.33.1
>
Guenter Roeck Nov. 14, 2021, 4:53 p.m. UTC | #2
On Wed, Nov 10, 2021 at 06:53:38PM -0800, Zev Weiss wrote:
> The first call to nct6775_asuswmi_read() in nct6775_wmi_read_value()
> had been passing the full bank+register number instead of just the
> lower 8 bits.  It didn't end up actually causing problems because the
> second argument of that function is a u8 anyway, but it seems
> preferable to be explicit about it at the call site (and consistent
> with the rest of the code).
> 
> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
> Fixes: 3fbbfc27f955 ("hwmon: (nct6775) Support access via Asus WMI")
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Applied.

Thanks,
Guenter

> ---
>  drivers/hwmon/nct6775.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
> index 93dca471972e..57ce8633a725 100644
> --- a/drivers/hwmon/nct6775.c
> +++ b/drivers/hwmon/nct6775.c
> @@ -1527,7 +1527,7 @@ static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
>  
>  	nct6775_wmi_set_bank(data, reg);
>  
> -	err = nct6775_asuswmi_read(data->bank, reg, &tmp);
> +	err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
>  	if (err)
>  		return 0;
>
diff mbox series

Patch

diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 93dca471972e..57ce8633a725 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -1527,7 +1527,7 @@  static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
 
 	nct6775_wmi_set_bank(data, reg);
 
-	err = nct6775_asuswmi_read(data->bank, reg, &tmp);
+	err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
 	if (err)
 		return 0;