summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2026-03-19 05:56:18 +0300
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2026-03-23 13:12:05 +0300
commita5877e921389178f994a5ec15a145d7e7ba3ec65 (patch)
treeb09df280b7f63038f00a845b2260c04e0a860db9
parent1c9d30d37aaffe3454d70b89a77f8aaecda257bf (diff)
downloadlinux-a5877e921389178f994a5ec15a145d7e7ba3ec65.tar.xz
platform/x86: barco-p50-gpio: convert to guard() notation
Using guard notation simplifies control flow and makes the code clearer. Suggested-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Link: https://patch.msgid.link/20260318-barco-p50-gpio-set-v2-2-c0a4a6416163@gmail.com Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
-rw-r--r--drivers/platform/x86/barco-p50-gpio.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/drivers/platform/x86/barco-p50-gpio.c b/drivers/platform/x86/barco-p50-gpio.c
index 360ffd8505d6..2a6d8607c402 100644
--- a/drivers/platform/x86/barco-p50-gpio.c
+++ b/drivers/platform/x86/barco-p50-gpio.c
@@ -272,33 +272,27 @@ static int p50_gpio_get(struct gpio_chip *gc, unsigned int offset)
struct p50_gpio *p50 = gpiochip_get_data(gc);
int ret;
- mutex_lock(&p50->lock);
+ guard(mutex)(&p50->lock);
ret = p50_send_mbox_cmd(p50, P50_MBOX_CMD_READ_GPIO, gpio_params[offset], 0);
- if (ret == 0) {
- ret = p50_read_mbox_reg(p50, P50_MBOX_REG_DATA);
- if (ret >= 0)
- ret = !!ret;
- }
+ if (ret < 0)
+ return ret;
- mutex_unlock(&p50->lock);
+ ret = p50_read_mbox_reg(p50, P50_MBOX_REG_DATA);
+ if (ret < 0)
+ return ret;
- return ret;
+ return !!ret;
}
static int p50_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)
{
struct p50_gpio *p50 = gpiochip_get_data(gc);
- int ret;
-
- mutex_lock(&p50->lock);
- ret = p50_send_mbox_cmd(p50, P50_MBOX_CMD_WRITE_GPIO,
- gpio_params[offset], value);
+ guard(mutex)(&p50->lock);
- mutex_unlock(&p50->lock);
-
- return ret;
+ return p50_send_mbox_cmd(p50, P50_MBOX_CMD_WRITE_GPIO,
+ gpio_params[offset], value);
}
static int p50_gpio_probe(struct platform_device *pdev)