diff mbox

platform/x86: Use ACPI_FAILURE at appropriate places

Message ID 1474248831-29832-1-git-send-email-axel.lin@ingics.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Axel Lin Sept. 19, 2016, 1:33 a.m. UTC
Use ACPI_FAILURE() to replace !ACPI_SUCCESS(), this avoid !! operations.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/platform/x86/intel-hid.c          | 6 +++---
 drivers/platform/x86/intel-smartconnect.c | 2 +-
 drivers/platform/x86/intel-vbtn.c         | 2 +-
 drivers/platform/x86/panasonic-laptop.c   | 2 +-
 drivers/platform/x86/thinkpad_acpi.c      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

Comments

Henrique de Moraes Holschuh Sept. 19, 2016, 5:25 p.m. UTC | #1
On Mon, 19 Sep 2016, Axel Lin wrote:
> Use ACPI_FAILURE() to replace !ACPI_SUCCESS(), this avoid !! operations.

Surely no compiler is _that_ idiotic for it to make any difference to
generated code?

Anyway, it is arguably more readable, so I certainly have nothing
against the change on that grounds.


for the thinkpad-acpi bits:

Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>

> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index b65ce75..31fb979 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -9018,7 +9018,7 @@ static int mute_led_on_off(struct tp_led_table *t, bool state)
>  	acpi_handle temp;
>  	int output;
>  
> -	if (!ACPI_SUCCESS(acpi_get_handle(hkey_handle, t->name, &temp))) {
> +	if (ACPI_FAILURE(acpi_get_handle(hkey_handle, t->name, &temp))) {
>  		pr_warn("Thinkpad ACPI has no %s interface.\n", t->name);
>  		return -EIO;
>  	}
Andy Shevchenko Dec. 3, 2016, 12:45 p.m. UTC | #2
On Mon, Sep 19, 2016 at 4:33 AM, Axel Lin <axel.lin@ingics.com> wrote:
> Use ACPI_FAILURE() to replace !ACPI_SUCCESS(), this avoid !! operations.

I would agree that the main point is readability, not some unrealistic
compiler stupidity/

For sake of readability:
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
>  drivers/platform/x86/intel-hid.c          | 6 +++---
>  drivers/platform/x86/intel-smartconnect.c | 2 +-
>  drivers/platform/x86/intel-vbtn.c         | 2 +-
>  drivers/platform/x86/panasonic-laptop.c   | 2 +-
>  drivers/platform/x86/thinkpad_acpi.c      | 2 +-
>  5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
> index ed58742..00cbeca 100644
> --- a/drivers/platform/x86/intel-hid.c
> +++ b/drivers/platform/x86/intel-hid.c
> @@ -69,7 +69,7 @@ static int intel_hid_set_enable(struct device *device, int enable)
>
>         arg0.integer.value = enable;
>         status = acpi_evaluate_object(ACPI_HANDLE(device), "HDSM", &args, NULL);
> -       if (!ACPI_SUCCESS(status)) {
> +       if (ACPI_FAILURE(status)) {
>                 dev_warn(device, "failed to %sable hotkeys\n",
>                          enable ? "en" : "dis");
>                 return -EIO;
> @@ -148,7 +148,7 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
>         }
>
>         status = acpi_evaluate_integer(handle, "HDEM", NULL, &ev_index);
> -       if (!ACPI_SUCCESS(status)) {
> +       if (ACPI_FAILURE(status)) {
>                 dev_warn(&device->dev, "failed to get event index\n");
>                 return;
>         }
> @@ -167,7 +167,7 @@ static int intel_hid_probe(struct platform_device *device)
>         int err;
>
>         status = acpi_evaluate_integer(handle, "HDMM", NULL, &mode);
> -       if (!ACPI_SUCCESS(status)) {
> +       if (ACPI_FAILURE(status)) {
>                 dev_warn(&device->dev, "failed to read mode\n");
>                 return -ENODEV;
>         }
> diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel-smartconnect.c
> index 04cf5df..bbe4c06 100644
> --- a/drivers/platform/x86/intel-smartconnect.c
> +++ b/drivers/platform/x86/intel-smartconnect.c
> @@ -29,7 +29,7 @@ static int smartconnect_acpi_init(struct acpi_device *acpi)
>         acpi_status status;
>
>         status = acpi_evaluate_integer(acpi->handle, "GAOS", NULL, &value);
> -       if (!ACPI_SUCCESS(status))
> +       if (ACPI_FAILURE(status))
>                 return -EINVAL;
>
>         if (value & 0x1) {
> diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
> index 146d02f..f04a394 100644
> --- a/drivers/platform/x86/intel-vbtn.c
> +++ b/drivers/platform/x86/intel-vbtn.c
> @@ -97,7 +97,7 @@ static int intel_vbtn_probe(struct platform_device *device)
>         int err;
>
>         status = acpi_evaluate_object(handle, "VBDL", NULL, NULL);
> -       if (!ACPI_SUCCESS(status)) {
> +       if (ACPI_FAILURE(status)) {
>                 dev_warn(&device->dev, "failed to read Intel Virtual Button driver\n");
>                 return -ENODEV;
>         }
> diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
> index 3f87097..59b8eb6 100644
> --- a/drivers/platform/x86/panasonic-laptop.c
> +++ b/drivers/platform/x86/panasonic-laptop.c
> @@ -458,7 +458,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
>
>         rc = acpi_evaluate_integer(pcc->handle, METHOD_HKEY_QUERY,
>                                    NULL, &result);
> -       if (!ACPI_SUCCESS(rc)) {
> +       if (ACPI_FAILURE(rc)) {
>                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
>                                  "error getting hotkey status\n"));
>                 return;
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index b65ce75..31fb979 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -9018,7 +9018,7 @@ static int mute_led_on_off(struct tp_led_table *t, bool state)
>         acpi_handle temp;
>         int output;
>
> -       if (!ACPI_SUCCESS(acpi_get_handle(hkey_handle, t->name, &temp))) {
> +       if (ACPI_FAILURE(acpi_get_handle(hkey_handle, t->name, &temp))) {
>                 pr_warn("Thinkpad ACPI has no %s interface.\n", t->name);
>                 return -EIO;
>         }
> --
> 2.7.4
>
> --
> 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
diff mbox

Patch

diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index ed58742..00cbeca 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -69,7 +69,7 @@  static int intel_hid_set_enable(struct device *device, int enable)
 
 	arg0.integer.value = enable;
 	status = acpi_evaluate_object(ACPI_HANDLE(device), "HDSM", &args, NULL);
-	if (!ACPI_SUCCESS(status)) {
+	if (ACPI_FAILURE(status)) {
 		dev_warn(device, "failed to %sable hotkeys\n",
 			 enable ? "en" : "dis");
 		return -EIO;
@@ -148,7 +148,7 @@  static void notify_handler(acpi_handle handle, u32 event, void *context)
 	}
 
 	status = acpi_evaluate_integer(handle, "HDEM", NULL, &ev_index);
-	if (!ACPI_SUCCESS(status)) {
+	if (ACPI_FAILURE(status)) {
 		dev_warn(&device->dev, "failed to get event index\n");
 		return;
 	}
@@ -167,7 +167,7 @@  static int intel_hid_probe(struct platform_device *device)
 	int err;
 
 	status = acpi_evaluate_integer(handle, "HDMM", NULL, &mode);
-	if (!ACPI_SUCCESS(status)) {
+	if (ACPI_FAILURE(status)) {
 		dev_warn(&device->dev, "failed to read mode\n");
 		return -ENODEV;
 	}
diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel-smartconnect.c
index 04cf5df..bbe4c06 100644
--- a/drivers/platform/x86/intel-smartconnect.c
+++ b/drivers/platform/x86/intel-smartconnect.c
@@ -29,7 +29,7 @@  static int smartconnect_acpi_init(struct acpi_device *acpi)
 	acpi_status status;
 
 	status = acpi_evaluate_integer(acpi->handle, "GAOS", NULL, &value);
-	if (!ACPI_SUCCESS(status))
+	if (ACPI_FAILURE(status))
 		return -EINVAL;
 
 	if (value & 0x1) {
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index 146d02f..f04a394 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -97,7 +97,7 @@  static int intel_vbtn_probe(struct platform_device *device)
 	int err;
 
 	status = acpi_evaluate_object(handle, "VBDL", NULL, NULL);
-	if (!ACPI_SUCCESS(status)) {
+	if (ACPI_FAILURE(status)) {
 		dev_warn(&device->dev, "failed to read Intel Virtual Button driver\n");
 		return -ENODEV;
 	}
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 3f87097..59b8eb6 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -458,7 +458,7 @@  static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
 
 	rc = acpi_evaluate_integer(pcc->handle, METHOD_HKEY_QUERY,
 				   NULL, &result);
-	if (!ACPI_SUCCESS(rc)) {
+	if (ACPI_FAILURE(rc)) {
 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 				 "error getting hotkey status\n"));
 		return;
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index b65ce75..31fb979 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -9018,7 +9018,7 @@  static int mute_led_on_off(struct tp_led_table *t, bool state)
 	acpi_handle temp;
 	int output;
 
-	if (!ACPI_SUCCESS(acpi_get_handle(hkey_handle, t->name, &temp))) {
+	if (ACPI_FAILURE(acpi_get_handle(hkey_handle, t->name, &temp))) {
 		pr_warn("Thinkpad ACPI has no %s interface.\n", t->name);
 		return -EIO;
 	}