Re: [PATCH v2 1/3] Sony-laptop: Fix exception handling in sony_nc_setup_rfkill()

[Andy Shevchenko]

On Wed, Nov 1, 2017 at 8:46 PM, SF Markus Elfring
 wrote:
> From: Markus Elfring 
> Date: Wed, 1 Nov 2017 18:42:45 +0100
>
> Source code review for a specific software refactoring showed the need
> for another correction because the error code "-1" was returned so far
> if a call of the function "sony_call_snc_handle" failed here.
> Thus assign the return value from these two function calls also to
> the variable "err" and provide it in case of a failure.
>

Applied to my review and testing queue, thanks!

> Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft 
> rfkill status stored in hw")
> Suggested-by: Andy Shevchenko 
> Link: https://lkml.org/lkml/2017/10/31/463
> Link: 
> https://lkml.kernel.org/r/
> Signed-off-by: Markus Elfring 
> ---
>  drivers/platform/x86/sony-laptop.c | 14 --
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/platform/x86/sony-laptop.c 
> b/drivers/platform/x86/sony-laptop.c
> index a16cea2be9c3..4332cc982ce0 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct acpi_device 
> *device,
> if (!rfk)
> return -ENOMEM;
>
> -   if (sony_call_snc_handle(sony_rfkill_handle, 0x200, ) < 0) {
> +   err = sony_call_snc_handle(sony_rfkill_handle, 0x200, );
> +   if (err < 0) {
> rfkill_destroy(rfk);
> -   return -1;
> +   return err;
> }
> hwblock = !(result & 0x1);
>
> -   if (sony_call_snc_handle(sony_rfkill_handle,
> -   sony_rfkill_address[nc_type],
> -   ) < 0) {
> +   err = sony_call_snc_handle(sony_rfkill_handle,
> +  sony_rfkill_address[nc_type],
> +  );
> +   if (err < 0) {
> rfkill_destroy(rfk);
> -   return -1;
> +   return err;
> }
> swblock = !(result & 0x2);
>
> --
> 2.14.3
>



-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2 1/3] Sony-laptop: Fix exception handling in sony_nc_setup_rfkill()

[Andy Shevchenko]

On Wed, Nov 1, 2017 at 8:46 PM, SF Markus Elfring
 wrote:
> From: Markus Elfring 
> Date: Wed, 1 Nov 2017 18:42:45 +0100
>
> Source code review for a specific software refactoring showed the need
> for another correction because the error code "-1" was returned so far
> if a call of the function "sony_call_snc_handle" failed here.
> Thus assign the return value from these two function calls also to
> the variable "err" and provide it in case of a failure.
>

Applied to my review and testing queue, thanks!

> Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft 
> rfkill status stored in hw")
> Suggested-by: Andy Shevchenko 
> Link: https://lkml.org/lkml/2017/10/31/463
> Link: 
> https://lkml.kernel.org/r/
> Signed-off-by: Markus Elfring 
> ---
>  drivers/platform/x86/sony-laptop.c | 14 --
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/platform/x86/sony-laptop.c 
> b/drivers/platform/x86/sony-laptop.c
> index a16cea2be9c3..4332cc982ce0 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct acpi_device 
> *device,
> if (!rfk)
> return -ENOMEM;
>
> -   if (sony_call_snc_handle(sony_rfkill_handle, 0x200, ) < 0) {
> +   err = sony_call_snc_handle(sony_rfkill_handle, 0x200, );
> +   if (err < 0) {
> rfkill_destroy(rfk);
> -   return -1;
> +   return err;
> }
> hwblock = !(result & 0x1);
>
> -   if (sony_call_snc_handle(sony_rfkill_handle,
> -   sony_rfkill_address[nc_type],
> -   ) < 0) {
> +   err = sony_call_snc_handle(sony_rfkill_handle,
> +  sony_rfkill_address[nc_type],
> +  );
> +   if (err < 0) {
> rfkill_destroy(rfk);
> -   return -1;
> +   return err;
> }
> swblock = !(result & 0x2);
>
> --
> 2.14.3
>



-- 
With Best Regards,
Andy Shevchenko

[PATCH v2 1/3] Sony-laptop: Fix exception handling in sony_nc_setup_rfkill()

[SF Markus Elfring]

From: Markus Elfring 
Date: Wed, 1 Nov 2017 18:42:45 +0100

Source code review for a specific software refactoring showed the need
for another correction because the error code "-1" was returned so far
if a call of the function "sony_call_snc_handle" failed here.
Thus assign the return value from these two function calls also to
the variable "err" and provide it in case of a failure.

Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill 
status stored in hw")
Suggested-by: Andy Shevchenko 
Link: https://lkml.org/lkml/2017/10/31/463
Link: 
https://lkml.kernel.org/r/
Signed-off-by: Markus Elfring 
---
 drivers/platform/x86/sony-laptop.c | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c 
b/drivers/platform/x86/sony-laptop.c
index a16cea2be9c3..4332cc982ce0 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct acpi_device 
*device,
if (!rfk)
return -ENOMEM;
 
-   if (sony_call_snc_handle(sony_rfkill_handle, 0x200, ) < 0) {
+   err = sony_call_snc_handle(sony_rfkill_handle, 0x200, );
+   if (err < 0) {
rfkill_destroy(rfk);
-   return -1;
+   return err;
}
hwblock = !(result & 0x1);
 
-   if (sony_call_snc_handle(sony_rfkill_handle,
-   sony_rfkill_address[nc_type],
-   ) < 0) {
+   err = sony_call_snc_handle(sony_rfkill_handle,
+  sony_rfkill_address[nc_type],
+  );
+   if (err < 0) {
rfkill_destroy(rfk);
-   return -1;
+   return err;
}
swblock = !(result & 0x2);
 
-- 
2.14.3

[PATCH v2 1/3] Sony-laptop: Fix exception handling in sony_nc_setup_rfkill()

[SF Markus Elfring]

From: Markus Elfring 
Date: Wed, 1 Nov 2017 18:42:45 +0100

Source code review for a specific software refactoring showed the need
for another correction because the error code "-1" was returned so far
if a call of the function "sony_call_snc_handle" failed here.
Thus assign the return value from these two function calls also to
the variable "err" and provide it in case of a failure.

Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill 
status stored in hw")
Suggested-by: Andy Shevchenko 
Link: https://lkml.org/lkml/2017/10/31/463
Link: 
https://lkml.kernel.org/r/
Signed-off-by: Markus Elfring 
---
 drivers/platform/x86/sony-laptop.c | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c 
b/drivers/platform/x86/sony-laptop.c
index a16cea2be9c3..4332cc982ce0 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct acpi_device 
*device,
if (!rfk)
return -ENOMEM;
 
-   if (sony_call_snc_handle(sony_rfkill_handle, 0x200, ) < 0) {
+   err = sony_call_snc_handle(sony_rfkill_handle, 0x200, );
+   if (err < 0) {
rfkill_destroy(rfk);
-   return -1;
+   return err;
}
hwblock = !(result & 0x1);
 
-   if (sony_call_snc_handle(sony_rfkill_handle,
-   sony_rfkill_address[nc_type],
-   ) < 0) {
+   err = sony_call_snc_handle(sony_rfkill_handle,
+  sony_rfkill_address[nc_type],
+  );
+   if (err < 0) {
rfkill_destroy(rfk);
-   return -1;
+   return err;
}
swblock = !(result & 0x2);
 
-- 
2.14.3