]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/xe/configfs: Use guard() for dev->lock
authorLucas De Marchi <lucas.demarchi@intel.com>
Thu, 21 Aug 2025 16:18:03 +0000 (09:18 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 22 Aug 2025 18:46:45 +0000 (11:46 -0700)
Instead of the manual lock()/unlock() pattern, use guard() which will
make things easier for handling errors or early returns.

Reviewed-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Link: https://lore.kernel.org/r/20250821-psmi-v5-8-34ab7550d3d8@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/xe_configfs.c

index 61376dfc74bb39110e419ff1fc4ac286ba835d49..de73c4ff8f4f2a2364ad9208107bad3619f9c250 100644 (file)
@@ -5,6 +5,7 @@
 
 #include <linux/bitops.h>
 #include <linux/configfs.h>
+#include <linux/cleanup.h>
 #include <linux/find.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -164,9 +165,8 @@ static ssize_t survivability_mode_store(struct config_item *item, const char *pa
        if (ret)
                return ret;
 
-       mutex_lock(&dev->lock);
+       guard(mutex)(&dev->lock);
        dev->config.survivability_mode = survivability_mode;
-       mutex_unlock(&dev->lock);
 
        return len;
 }
@@ -248,9 +248,8 @@ static ssize_t engines_allowed_store(struct config_item *item, const char *page,
                val |= mask;
        }
 
-       mutex_lock(&dev->lock);
+       guard(mutex)(&dev->lock);
        dev->config.engines_allowed = val;
-       mutex_unlock(&dev->lock);
 
        return len;
 }
@@ -272,9 +271,8 @@ static ssize_t enable_psmi_store(struct config_item *item, const char *page, siz
        if (ret)
                return ret;
 
-       mutex_lock(&dev->lock);
+       guard(mutex)(&dev->lock);
        dev->config.enable_psmi = val;
-       mutex_unlock(&dev->lock);
 
        return len;
 }
@@ -454,9 +452,8 @@ void xe_configfs_clear_survivability_mode(struct pci_dev *pdev)
        if (!dev)
                return;
 
-       mutex_lock(&dev->lock);
+       guard(mutex)(&dev->lock);
        dev->config.survivability_mode = 0;
-       mutex_unlock(&dev->lock);
 
        config_group_put(&dev->group);
 }