Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1612911 > unrolled thread

[PATCH 04/11] platform/x86: fujitsu-laptop: simplify set_lcd_level()

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 04/11] platform/x86: fujitsu-laptop: simplify set_lcd_level() Michał Kępień <kernel@kempniu.pl> - 2017-03-30 12:40 +0200
    Re: [PATCH 04/11] platform/x86: fujitsu-laptop: simplify  set_lcd_level() Darren Hart <dvhart@infradead.org> - 2017-04-04 02:10 +0200
      [PATCH 04+/11] platform/x86: fujitsu-laptop: simplify set_lcd_level() Michał Kępień <kernel@kempniu.pl> - 2017-04-04 11:40 +0200
        Re: [PATCH 04+/11] platform/x86: fujitsu-laptop: simplify  set_lcd_level() Darren Hart <dvhart@infradead.org> - 2017-04-04 17:50 +0200

#1612911 — [PATCH 04/11] platform/x86: fujitsu-laptop: simplify set_lcd_level()

acpi_execute_simple_method() takes a method parameter which tells it to
look for the given method underneath the given handle, so calling
acpi_get_handle() beforehand is redundant.  Replace the call to
acpi_get_handle() with a call to acpi_execute_simple_method(), thus
eliminating the need for a local variable storing the handle.  Also do
not assign a default value to status as it has no influence on execution
flow.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
 drivers/platform/x86/fujitsu-laptop.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 5005400b57bb..b888ba190fb2 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -358,8 +358,7 @@ static enum led_brightness eco_led_get(struct led_classdev *cdev)
 
 static int set_lcd_level(int level)
 {
-	acpi_status status = AE_OK;
-	acpi_handle handle = NULL;
+	acpi_status status;
 	char *method;
 
 	switch (use_alt_lcd_levels) {
@@ -377,16 +376,13 @@ static int set_lcd_level(int level)
 	if (level < 0 || level >= fujitsu_bl->max_brightness)
 		return -EINVAL;
 
-	status = acpi_get_handle(fujitsu_bl->acpi_handle, method, &handle);
+	status = acpi_execute_simple_method(fujitsu_bl->acpi_handle, method,
+					    level);
 	if (ACPI_FAILURE(status)) {
 		vdbg_printk(FUJLAPTOP_DBG_ERROR, "%s not present\n", method);
 		return -ENODEV;
 	}
 
-	status = acpi_execute_simple_method(handle, NULL, level);
-	if (ACPI_FAILURE(status))
-		return -ENODEV;
-
 	return 0;
 }
 
-- 
2.12.1

[toc] | [next] | [standalone]

#1615629 — Re: [PATCH 04/11] platform/x86: fujitsu-laptop: simplify set_lcd_level()

On Thu, Mar 30, 2017 at 12:35:02PM +0200, Michał Kępień wrote:
> acpi_execute_simple_method() takes a method parameter which tells it to
> look for the given method underneath the given handle, so calling
> acpi_get_handle() beforehand is redundant.  Replace the call to
> acpi_get_handle() with a call to acpi_execute_simple_method(), thus
> eliminating the need for a local variable storing the handle.  Also do
> not assign a default value to status as it has no influence on execution
> flow.
> 
> Signed-off-by: Michał Kępień <kernel@kempniu.pl>
> ---
>  drivers/platform/x86/fujitsu-laptop.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> index 5005400b57bb..b888ba190fb2 100644
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -358,8 +358,7 @@ static enum led_brightness eco_led_get(struct led_classdev *cdev)
>  
>  static int set_lcd_level(int level)
>  {
> -	acpi_status status = AE_OK;
> -	acpi_handle handle = NULL;
> +	acpi_status status;
>  	char *method;
>  
>  	switch (use_alt_lcd_levels) {
> @@ -377,16 +376,13 @@ static int set_lcd_level(int level)
>  	if (level < 0 || level >= fujitsu_bl->max_brightness)
>  		return -EINVAL;
>  
> -	status = acpi_get_handle(fujitsu_bl->acpi_handle, method, &handle);
> +	status = acpi_execute_simple_method(fujitsu_bl->acpi_handle, method,
> +					    level);
>  	if (ACPI_FAILURE(status)) {
>  		vdbg_printk(FUJLAPTOP_DBG_ERROR, "%s not present\n", method);

So this changes behavior a little bit for debug messages. Previously, this
message only triggered if acpi_get_handle failed, now it will trigger if the
method exists but fails, whereas that was silent previously (see below). I think
printing in either case is fine, but we should adjust the message to reflect the
new code flow.

>  		return -ENODEV;
>  	}
>  
> -	status = acpi_execute_simple_method(handle, NULL, level);
> -	if (ACPI_FAILURE(status))
> -		return -ENODEV;
> -
>  	return 0;
>  }
>  
> -- 
> 2.12.1
> 
> 

-- 
Darren Hart
VMware Open Source Technology Center

[toc] | [prev] | [next] | [standalone]

#1615831 — [PATCH 04+/11] platform/x86: fujitsu-laptop: simplify set_lcd_level()

acpi_execute_simple_method() takes a method parameter which tells it to
look for the given method underneath the given handle, so calling
acpi_get_handle() beforehand is redundant.  Replace the call to
acpi_get_handle() with a call to acpi_execute_simple_method(), thus
eliminating the need for a local variable storing the handle.  Update
debug message to reflect this change.  Also do not assign a default
value to status as it has no influence on execution flow.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
Darren,

This is patch 04/11 with updated debug and commit messages.  Now that
you mentioned this issue, I think we should do the same for patch 2/3 in
the call_fext_func() cleanup series [1].  Would you like me to just send
an updated version of that specific patch (similarly to what I did in
this case) or rather send v2 of the entire call_fext_func() cleanup
series?

[1] https://www.spinics.net/lists/platform-driver-x86/msg11058.html

 drivers/platform/x86/fujitsu-laptop.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 2f563aa00592..6d4a2a36716b 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -358,8 +358,7 @@ static enum led_brightness eco_led_get(struct led_classdev *cdev)
 
 static int set_lcd_level(int level)
 {
-	acpi_status status = AE_OK;
-	acpi_handle handle = NULL;
+	acpi_status status;
 	char *method;
 
 	switch (use_alt_lcd_levels) {
@@ -377,16 +376,14 @@ static int set_lcd_level(int level)
 	if (level < 0 || level >= fujitsu_bl->max_brightness)
 		return -EINVAL;
 
-	status = acpi_get_handle(fujitsu_bl->acpi_handle, method, &handle);
+	status = acpi_execute_simple_method(fujitsu_bl->acpi_handle, method,
+					    level);
 	if (ACPI_FAILURE(status)) {
-		vdbg_printk(FUJLAPTOP_DBG_ERROR, "%s not present\n", method);
+		vdbg_printk(FUJLAPTOP_DBG_ERROR, "Failed to evaluate %s\n",
+			    method);
 		return -ENODEV;
 	}
 
-	status = acpi_execute_simple_method(handle, NULL, level);
-	if (ACPI_FAILURE(status))
-		return -ENODEV;
-
 	return 0;
 }
 
-- 
2.12.2

[toc] | [prev] | [next] | [standalone]

#1616128 — Re: [PATCH 04+/11] platform/x86: fujitsu-laptop: simplify set_lcd_level()

On Tue, Apr 04, 2017 at 11:39:03AM +0200, Michał Kępień wrote:
> acpi_execute_simple_method() takes a method parameter which tells it to
> look for the given method underneath the given handle, so calling
> acpi_get_handle() beforehand is redundant.  Replace the call to
> acpi_get_handle() with a call to acpi_execute_simple_method(), thus
> eliminating the need for a local variable storing the handle.  Update
> debug message to reflect this change.  Also do not assign a default
> value to status as it has no influence on execution flow.
> 
> Signed-off-by: Michał Kępień <kernel@kempniu.pl>
> ---
> Darren,
> 
> This is patch 04/11 with updated debug and commit messages.  Now that
> you mentioned this issue, I think we should do the same for patch 2/3 in
> the call_fext_func() cleanup series [1].  Would you like me to just send
> an updated version of that specific patch (similarly to what I did in
> this case) or rather send v2 of the entire call_fext_func() cleanup
> series?

Thanks, looks good.

Now that there is more than one cleanup, please do just send a v2 of the entire
series. Less error prone that way.

Thanks,

-- 
Darren Hart
VMware Open Source Technology Center

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web