[PATCH] asus-laptop: is_visible should not return a bool

[PATCH] asus-laptop: is_visible should not return a bool

[Vivien Didelot]

With a Lucid platform, asus_sysfs_is_visible() returns a boolean for
ls_switch and ls_level attributes. Fix that and also s/supported/ok/ and
s/asus->handle/handle/ to avoid lines wider than 80 chars.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
 drivers/platform/x86/asus-laptop.c | 46 ++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index f71700e..c7d1655 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1605,55 +1605,47 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,
 	struct platform_device *pdev = to_platform_device(dev);
 	struct asus_laptop *asus = platform_get_drvdata(pdev);
 	acpi_handle handle = asus->handle;
-	bool supported;
+	bool ok;
 
-	if (asus->is_pega_lucid) {
-		/* no ls_level interface on the Lucid */
-		if (attr == &dev_attr_ls_switch.attr)
-			supported = true;
-		else if (attr == &dev_attr_ls_level.attr)
-			supported = false;
-		else
-			goto normal;
+	if (asus->is_pega_lucid && attr == &dev_attr_ls_switch.attr) {
+		ok = true;
 
-		return supported;
-	}
+	} else if (asus->is_pega_lucid && attr == &dev_attr_ls_level.attr) {
+		ok = false; /* no ls_level interface on the Lucid */
 
-normal:
-	if (attr == &dev_attr_wlan.attr) {
-		supported = !acpi_check_handle(handle, METHOD_WLAN, NULL);
+	} else if (attr == &dev_attr_wlan.attr) {
+		ok = !acpi_check_handle(handle, METHOD_WLAN, NULL);
 
 	} else if (attr == &dev_attr_bluetooth.attr) {
-		supported = !acpi_check_handle(handle, METHOD_BLUETOOTH, NULL);
+		ok = !acpi_check_handle(handle, METHOD_BLUETOOTH, NULL);
 
 	} else if (attr == &dev_attr_display.attr) {
-		supported = !acpi_check_handle(handle, METHOD_SWITCH_DISPLAY, NULL);
+		ok = !acpi_check_handle(handle, METHOD_SWITCH_DISPLAY, NULL);
 
 	} else if (attr == &dev_attr_wimax.attr) {
-		supported =
-			!acpi_check_handle(asus->handle, METHOD_WIMAX, NULL);
+		ok = !acpi_check_handle(handle, METHOD_WIMAX, NULL);
 
 	} else if (attr == &dev_attr_wwan.attr) {
-		supported = !acpi_check_handle(asus->handle, METHOD_WWAN, NULL);
+		ok = !acpi_check_handle(handle, METHOD_WWAN, NULL);
 
 	} else if (attr == &dev_attr_ledd.attr) {
-		supported = !acpi_check_handle(handle, METHOD_LEDD, NULL);
+		ok = !acpi_check_handle(handle, METHOD_LEDD, NULL);
 
 	} else if (attr == &dev_attr_ls_switch.attr ||
 		   attr == &dev_attr_ls_level.attr) {
-		supported = !acpi_check_handle(handle, METHOD_ALS_CONTROL, NULL) &&
+		ok = !acpi_check_handle(handle, METHOD_ALS_CONTROL, NULL) &&
 			!acpi_check_handle(handle, METHOD_ALS_LEVEL, NULL);
 	} else if (attr == &dev_attr_ls_value.attr) {
-		supported = asus->is_pega_lucid;
+		ok = asus->is_pega_lucid;
 	} else if (attr == &dev_attr_gps.attr) {
-		supported = !acpi_check_handle(handle, METHOD_GPS_ON, NULL) &&
-			    !acpi_check_handle(handle, METHOD_GPS_OFF, NULL) &&
-			    !acpi_check_handle(handle, METHOD_GPS_STATUS, NULL);
+		ok = !acpi_check_handle(handle, METHOD_GPS_ON, NULL) &&
+			!acpi_check_handle(handle, METHOD_GPS_OFF, NULL) &&
+			!acpi_check_handle(handle, METHOD_GPS_STATUS, NULL);
 	} else {
-		supported = true;
+		ok = true;
 	}
 
-	return supported ? attr->mode : 0;
+	return ok ? attr->mode : 0;
 }
 
 
-- 
2.2.2

Re: [PATCH] asus-laptop: is_visible should not return a bool

[Darren Hart]

On Fri, Jan 16, 2015 at 09:29:19AM -0500, Vivien Didelot wrote:
> With a Lucid platform, asus_sysfs_is_visible() returns a boolean for
> ls_switch and ls_level attributes. Fix that and also s/supported/ok/ and
> s/asus->handle/handle/ to avoid lines wider than 80 chars.

This is two patches, a cleanup and functional change. Since the cleanup has
nothing to do with the cleanup, please split these out.

"ok" is an atypical variable name. It looks as though "ret" would server just as
well and is far more consistent with typical usage.

-- 
Darren Hart
Intel Open Source Technology Center