Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1554304 > unrolled thread
| Started by | Michał Kępień <kernel@kempniu.pl> |
|---|---|
| First post | 2017-01-09 14:20 +0100 |
| Last post | 2017-01-09 14:40 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v2 1/2] platform/x86: fujitsu-laptop: rework logolamp_set() to properly handle errors Michał Kępień <kernel@kempniu.pl> - 2017-01-09 14:20 +0100
Re: [PATCH v2 1/2] platform/x86: fujitsu-laptop: rework logolamp_set() to properly handle errors Jonathan Woithe <jwoithe@just42.net> - 2017-01-09 14:40 +0100
| From | Michał Kępień <kernel@kempniu.pl> |
|---|---|
| Date | 2017-01-09 14:20 +0100 |
| Subject | [PATCH v2 1/2] platform/x86: fujitsu-laptop: rework logolamp_set() to properly handle errors |
| Message-ID | <sXI1H-4H4-5@gated-at.bofh.it> |
Potential errors returned by some call_fext_func() calls inside
logolamp_set() are currently ignored. Rework logolamp_set() to properly
handle them. This causes one more call_fext_func() call to be made in
the LED_OFF case, though one could argue that this is logically the
right thing to do (even though the extra call is not needed to shut the
LED off).
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
Changes from v1:
- Decrease indentation by rearranging logical conditions.
- Split variable declarations into two lines.
drivers/platform/x86/fujitsu-laptop.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index b725a907a91f..34b8481fb0ed 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -271,15 +271,20 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2)
static int logolamp_set(struct led_classdev *cdev,
enum led_brightness brightness)
{
- if (brightness >= LED_FULL) {
- call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
- return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_ON);
- } else if (brightness >= LED_HALF) {
- call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
- return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_OFF);
- } else {
- return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_OFF);
- }
+ int poweron = FUNC_LED_ON, always = FUNC_LED_ON;
+ int ret;
+
+ if (brightness < LED_HALF)
+ poweron = FUNC_LED_OFF;
+
+ if (brightness < LED_FULL)
+ always = FUNC_LED_OFF;
+
+ ret = call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, poweron);
+ if (ret < 0)
+ return ret;
+
+ return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, always);
}
static int kblamps_set(struct led_classdev *cdev,
--
2.11.0
[toc] | [next] | [standalone]
| From | Jonathan Woithe <jwoithe@just42.net> |
|---|---|
| Date | 2017-01-09 14:40 +0100 |
| Subject | Re: [PATCH v2 1/2] platform/x86: fujitsu-laptop: rework logolamp_set() to properly handle errors |
| Message-ID | <sXIl4-4NO-37@gated-at.bofh.it> |
| In reply to | #1554304 |
On Mon, Jan 09, 2017 at 02:14:16PM +0100, Micha?? K??pie?? wrote:
> Potential errors returned by some call_fext_func() calls inside
> logolamp_set() are currently ignored. Rework logolamp_set() to properly
> handle them. This causes one more call_fext_func() call to be made in
> the LED_OFF case, though one could argue that this is logically the
> right thing to do (even though the extra call is not needed to shut the
> LED off).
>
> Signed-off-by: Micha?? K??pie?? <kernel@kempniu.pl>
Acked-by: Jonathan Woithe <jwoithe@just42.net>
> ---
> Changes from v1:
>
> - Decrease indentation by rearranging logical conditions.
> - Split variable declarations into two lines.
>
> drivers/platform/x86/fujitsu-laptop.c | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> index b725a907a91f..34b8481fb0ed 100644
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -271,15 +271,20 @@ static int call_fext_func(int cmd, int arg0, int arg1, int arg2)
> static int logolamp_set(struct led_classdev *cdev,
> enum led_brightness brightness)
> {
> - if (brightness >= LED_FULL) {
> - call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
> - return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_ON);
> - } else if (brightness >= LED_HALF) {
> - call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_ON);
> - return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, FUNC_LED_OFF);
> - } else {
> - return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, FUNC_LED_OFF);
> - }
> + int poweron = FUNC_LED_ON, always = FUNC_LED_ON;
> + int ret;
> +
> + if (brightness < LED_HALF)
> + poweron = FUNC_LED_OFF;
> +
> + if (brightness < LED_FULL)
> + always = FUNC_LED_OFF;
> +
> + ret = call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_POWERON, poweron);
> + if (ret < 0)
> + return ret;
> +
> + return call_fext_func(FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, always);
> }
>
> static int kblamps_set(struct led_classdev *cdev,
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web