platform/x86: ideapad-laptop: Make the scope_guard() clear of its scope

[ Upstream commit a093cb667c3ff5eadd4b23ddf996d9ccae9b7ac6 ]

First of all, it's a bit counterintuitive to have something like

	int err;
	...
	scoped_guard(...)
		err = foo(...);
	if (err)
		return err;

Second, with a particular kernel configuration and compiler version in
one of such cases the objtool is not happy:

  ideapad-laptop.o: warning: objtool: .text.fan_mode_show: unexpected end of section

I'm not an expert on all this, but the theory is that compiler and
linker in this case can't understand that 'result' variable will be
always initialized as long as no error has been returned. Assigning
'result' to a dummy value helps with this. Note, that fixing the
scoped_guard() scope (as per above) does not make issue gone.

That said, assign dummy value and make the scope_guard() clear of its scope.
For the sake of consistency do it in the entire file.

Fixes: 7cc06e729460 ("platform/x86: ideapad-laptop: add a mutex to synchronize VPC commands")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202408290219.BrPO8twi-lkp@intel.com/
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240829165105.1609180-1-andriy.shevchenko@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 490815917adec8f834904a4f78a979185e162632..32293df50bb1cc27dde91f764676b7e127919282 100644 (file)
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -422,13 +422,14 @@ static ssize_t camera_power_show(struct device *dev,
                                 char *buf)
 {
        struct ideapad_private *priv = dev_get_drvdata(dev);
-       unsigned long result;
+       unsigned long result = 0;
        int err;
 
-       scoped_guard(mutex, &priv->vpc_mutex)
+       scoped_guard(mutex, &priv->vpc_mutex) {
                err = read_ec_data(priv->adev->handle, VPCCMD_R_CAMERA, &result);
-       if (err)
-               return err;
+               if (err)
+                       return err;
+       }
 
        return sysfs_emit(buf, "%d\n", !!result);
 }
@@ -445,10 +446,11 @@ static ssize_t camera_power_store(struct device *dev,
        if (err)
                return err;
 
-       scoped_guard(mutex, &priv->vpc_mutex)
+       scoped_guard(mutex, &priv->vpc_mutex) {
                err = write_ec_cmd(priv->adev->handle, VPCCMD_W_CAMERA, state);
-       if (err)
-               return err;
+               if (err)
+                       return err;
+       }
 
        return count;
 }
@@ -496,13 +498,14 @@ static ssize_t fan_mode_show(struct device *dev,
                             char *buf)
 {
        struct ideapad_private *priv = dev_get_drvdata(dev);
-       unsigned long result;
+       unsigned long result = 0;
        int err;
 
-       scoped_guard(mutex, &priv->vpc_mutex)
+       scoped_guard(mutex, &priv->vpc_mutex) {
                err = read_ec_data(priv->adev->handle, VPCCMD_R_FAN, &result);
-       if (err)
-               return err;
+               if (err)
+                       return err;
+       }
 
        return sysfs_emit(buf, "%lu\n", result);
 }
@@ -522,10 +525,11 @@ static ssize_t fan_mode_store(struct device *dev,
        if (state > 4 || state == 3)
                return -EINVAL;
 
-       scoped_guard(mutex, &priv->vpc_mutex)
+       scoped_guard(mutex, &priv->vpc_mutex) {
                err = write_ec_cmd(priv->adev->handle, VPCCMD_W_FAN, state);
-       if (err)
-               return err;
+               if (err)
+                       return err;
+       }
 
        return count;
 }
@@ -605,13 +609,14 @@ static ssize_t touchpad_show(struct device *dev,
                             char *buf)
 {
        struct ideapad_private *priv = dev_get_drvdata(dev);
-       unsigned long result;
+       unsigned long result = 0;
        int err;
 
-       scoped_guard(mutex, &priv->vpc_mutex)
+       scoped_guard(mutex, &priv->vpc_mutex) {
                err = read_ec_data(priv->adev->handle, VPCCMD_R_TOUCHPAD, &result);
-       if (err)
-               return err;
+               if (err)
+                       return err;
+       }
 
        priv->r_touchpad_val = result;
 
@@ -630,10 +635,11 @@ static ssize_t touchpad_store(struct device *dev,
        if (err)
                return err;
 
-       scoped_guard(mutex, &priv->vpc_mutex)
+       scoped_guard(mutex, &priv->vpc_mutex) {
                err = write_ec_cmd(priv->adev->handle, VPCCMD_W_TOUCHPAD, state);
-       if (err)
-               return err;
+               if (err)
+                       return err;
+       }
 
        priv->r_touchpad_val = state;