From 734197a933cd2fb4adac7213fd1fc4df284cae14 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 21 Aug 2025 09:18:03 -0700 Subject: [PATCH] drm/xe/configfs: Use guard() for dev->lock Instead of the manual lock()/unlock() pattern, use guard() which will make things easier for handling errors or early returns. Reviewed-by: Dnyaneshwar Bhadane Link: https://lore.kernel.org/r/20250821-psmi-v5-8-34ab7550d3d8@intel.com Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_configfs.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_configfs.c b/drivers/gpu/drm/xe/xe_configfs.c index 61376dfc74bb..de73c4ff8f4f 100644 --- a/drivers/gpu/drm/xe/xe_configfs.c +++ b/drivers/gpu/drm/xe/xe_configfs.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -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); } -- 2.47.3