Skip to contentSkip to conversation

panasonic-laptop: fix acpi_pcc_write_sset return value

PATCH In review Axel Lin 3 participants 3 messages Jul 7, 2010

Subsystems (2)
x86 platform drivers Panasonic laptop ACPI extras driver
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 panasonic-laptop: fix acpi_pcc_write_sset return value

In current implementation, acpi_pcc_write_sset return 1 if write is successful, 0 if write is failed.
But all the callers consider acpi_pcc_write_sset return 0 if write is successful and return negtive if write is failed.

This patch changes the implementation of acpi_pcc_write_sset to return 0 if write is successful, -EIO if write is failed.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/platform/x86/panasonic-laptop.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/platform/x86/panasonic-laptop.c +2 -5
index 2fb9a32..ec01c3d 100644
@@ -248,7 +248,7 @@ static int acpi_pcc_write_sset(struct pcc_acpi *pcc, int func, int val)
 	status = acpi_evaluate_object(pcc->handle, METHOD_HKEY_SSET,
 				      &params, NULL);
 
-	return status == AE_OK;
+	return (status == AE_OK) ? 0 : -EIO;
 }
 
 static inline int acpi_pcc_get_sqty(struct acpi_device *device)

@@ -586,7 +586,6 @@ static int acpi_pcc_init_input(struct pcc_acpi *pcc)
 static int acpi_pcc_hotkey_resume(struct acpi_device *device)
 {
 	struct pcc_acpi *pcc = acpi_driver_data(device);
-	acpi_status status = AE_OK;
 
 	if (device == NULL || pcc == NULL)
 		return -EINVAL;

@@ -594,9 +593,7 @@ static int acpi_pcc_hotkey_resume(struct acpi_device *device)
 	ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Sticky mode restore: %d\n",
 			  pcc->sticky_mode));
 
-	status = acpi_pcc_write_sset(pcc, SINF_STICKY_KEY, pcc->sticky_mode);
-
-	return status == AE_OK ? 0 : -EINVAL;
+	return acpi_pcc_write_sset(pcc, SINF_STICKY_KEY, pcc->sticky_mode);
 }
 
 static int acpi_pcc_hotkey_add(struct acpi_device *device)
Signature · 1 line
1.5.4.3
Acked-by on v2 1/1
#1 lore raw
Quoted 27 lines · Axel Lin

In current implementation, acpi_pcc_write_sset return 1 if write is successful, 0 if write is failed.
But all the callers consider acpi_pcc_write_sset return 0 if write is successful and return negtive if write is failed.

This patch changes the implementation of acpi_pcc_write_sset to return 0 if write is successful, -EIO if write is failed.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/platform/x86/panasonic-laptop.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/platform/x86/panasonic-laptop.c +1 -1
index 2fb9a32..ec01c3d 100644
@@ -248,7 +248,7 @@ static int acpi_pcc_write_sset(struct pcc_acpi *pcc, int func, int val)
 	status = acpi_evaluate_object(pcc->handle, METHOD_HKEY_SSET,
 				      &params, NULL);
 
-	return status == AE_OK;
+	return (status == AE_OK) ? 0 : -EIO;
 }
 
 static inline int acpi_pcc_get_sqty(struct acpi_device *device)

drivers/platform/x86/panasonic-laptop.c static int acpi_pcc_init_input(struct pcc_acpi *pcc) · line 591

Quoted 7 lines
drivers/platform/x86/panasonic-laptop.c +0 -1
@@ -586,7 +586,6 @@ static int acpi_pcc_init_input(struct pcc_acpi *pcc)
 static int acpi_pcc_hotkey_resume(struct acpi_device *device)
 {
 	struct pcc_acpi *pcc = acpi_driver_data(device);
-	acpi_status status = AE_OK;
 
 	if (device == NULL || pcc == NULL)
 		return -EINVAL;

Looks good, but why don't you also kill these useless checks while you are at it? Otherwise:

Acked-by Dmitry Torokhov <[email protected]>

Thanks.

Signature · 1 line
Dmitry
Acked-by on v2 1/1
#2 lore raw
In reply to Axel Lin
Quoted 9 lines · Axel Lin

In current implementation, acpi_pcc_write_sset return 1 if write is successful, 0 if write is failed.
But all the callers consider acpi_pcc_write_sset return 0 if write is successful and return negtive if write is failed.

This patch changes the implementation of acpi_pcc_write_sset to return 0 if write is successful, -EIO if write is failed.

Signed-off-by Axel Lin <[email protected]>
Acked-by Harald Welte <[email protected]>
Signature · 4 lines
- Harald Welte <[email protected]>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)