Skip to content

Commit 6060a75

Browse files
Tom Rixjwrdegoede
authored andcommitted
platform/x86: thinkpad_acpi: consistently check fan_get_status return.
Clang static analysis returns this false positive thinkpad_acpi.c:8926:19: warning: The left operand of '!=' is a garbage value (status != 0) ? "enabled" : "disabled", status); ~~~~~~ ^ The return of fan_get_status* is checked inconsistenly. Sometime ret < 0 is an error, sometimes !ret. Both fan_get_status() and fan_get_status_safe() return 0 on success and return negative otherwise. Change the checks for error, ret < 0, into checks for not success, !ret. Signed-off-by: Tom Rix <trix@redhat.com> Link: https://lore.kernel.org/r/20220312145327.1398510-1-trix@redhat.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent 286e937 commit 6060a75

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/platform/x86/thinkpad_acpi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8285,7 +8285,7 @@ static int fan_set_enable(void)
82858285
case TPACPI_FAN_WR_ACPI_FANS:
82868286
case TPACPI_FAN_WR_TPEC:
82878287
rc = fan_get_status(&s);
8288-
if (rc < 0)
8288+
if (rc)
82898289
break;
82908290

82918291
/* Don't go out of emergency fan mode */
@@ -8304,7 +8304,7 @@ static int fan_set_enable(void)
83048304

83058305
case TPACPI_FAN_WR_ACPI_SFAN:
83068306
rc = fan_get_status(&s);
8307-
if (rc < 0)
8307+
if (rc)
83088308
break;
83098309

83108310
s &= 0x07;
@@ -8843,7 +8843,7 @@ static void fan_suspend(void)
88438843
/* Store fan status in cache */
88448844
fan_control_resume_level = 0;
88458845
rc = fan_get_status_safe(&fan_control_resume_level);
8846-
if (rc < 0)
8846+
if (rc)
88478847
pr_notice("failed to read fan level for later restore during resume: %d\n",
88488848
rc);
88498849

@@ -8864,7 +8864,7 @@ static void fan_resume(void)
88648864

88658865
if (!fan_control_allowed ||
88668866
!fan_control_resume_level ||
8867-
(fan_get_status_safe(&current_level) < 0))
8867+
fan_get_status_safe(&current_level))
88688868
return;
88698869

88708870
switch (fan_control_access_mode) {
@@ -8918,7 +8918,7 @@ static int fan_read(struct seq_file *m)
89188918
case TPACPI_FAN_RD_ACPI_GFAN:
89198919
/* 570, 600e/x, 770e, 770x */
89208920
rc = fan_get_status_safe(&status);
8921-
if (rc < 0)
8921+
if (rc)
89228922
return rc;
89238923

89248924
seq_printf(m, "status:\t\t%s\n"
@@ -8929,7 +8929,7 @@ static int fan_read(struct seq_file *m)
89298929
case TPACPI_FAN_RD_TPEC:
89308930
/* all except 570, 600e/x, 770e, 770x */
89318931
rc = fan_get_status_safe(&status);
8932-
if (rc < 0)
8932+
if (rc)
89338933
return rc;
89348934

89358935
seq_printf(m, "status:\t\t%s\n",

0 commit comments

Comments
 (0)