From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E395365A1B for ; Tue, 5 May 2026 22:07:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778018843; cv=none; b=KZVKCmVWXFJ80ttpPUqyh9r25oSM13V8x45opLP4f4JKz28qbQ4u7SovdUPZ5V+izQTnehd+dgIVZBdQtshA3A3askMpYFt0lZ90hpzI7ccO1Rb2d6acFFxR2N9EpWoLKWoswtt8kOnDLnbehIAZkHKpfj1lnz2ov9QF5fTdJ3I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778018843; c=relaxed/simple; bh=lZD7D11CckBI/PKQ7VizyDdDmJE29dmL8JUuxEkEhow=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TJmfZVMo3meeecKm1adZyM6w0otWnD9DOzUqKgaLbPhyui+vajvfWt9pOlxZDbEnArSJz8SPnrxUBosNfWuMdaGs9tr1jBPOU1UDRgRU5+w5iz1ZbvN3TceP+nfA5nARs8BTsndFdRN1WAN/vwn3b8HlrZnKM6qYAlH6B0dN2mE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N8XFJda7; arc=none smtp.client-ip=209.85.210.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N8XFJda7" Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-7dca4debedaso5253704a34.2 for ; Tue, 05 May 2026 15:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778018841; x=1778623641; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n3kzjFemdAtx6Fwcj2vfs9gjIG5kFgwI9kSRgO10wIQ=; b=N8XFJda7aX7r6pOEdi1SYhAbuesNsBODpVD3gN244e5BgN1HbWPwhosqAdU2Kf1DEG agWwpG0WAts1PKYHC9ore1hX9IJmbwhqzLAIsjLT1EFVEoQqLwgeuE2Py24IEY7Pz9P9 EPckcQE5He0Bnu4p4gl/FbSZzV9tRuZlIDkll3EOo8QCw2U9MjXDxKyiAnnM9jD2DZij tbYTRqfMG5WuRGYCaV27QKEYUI/wehU6Ow3Z4eifhy5Yl2XZGDUklxgoHcH909Uq7Lzt Y95iPQzKnx9agSEKoVxvGIvDUP1jGpAm/+DjLm/PDGyLKzUDCU/51LFDc9ZcCcdM/TSV wBSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778018841; x=1778623641; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=n3kzjFemdAtx6Fwcj2vfs9gjIG5kFgwI9kSRgO10wIQ=; b=BUN0QVpxp7O1w4IBprEwzj4P1cmyW35GZ0qn8LC2j/5bRc3OscWACRQ8dxpkL3LbNO TeHuBuV1fiRQpWJJLM7gmioCit61+cIOZ06jdYLe9/wzWPvvIBrxmIScuPmQSk/wbPtO amvkaUsPkz/2JRmHyPwkmjjDxvwZIsKdA/r2dAWObaqHSNduwBL5IWl2/Uskk/uIVNQF GFIZESuxjNzgO49x+vzawPb+G7QaG4cI4nsGJ7fuZZ2UcvxWwobpjdTL8+8EU+vSu/Pr ZTvSCgvuYxzwzzSDvBkGBPmIc2OZHAZW7+cv7cVKoY76QJjuHSYUDrz2Oi8Gqvl8AcVc 1clA== X-Forwarded-Encrypted: i=1; AFNElJ+boAhVVEeLaPhYNk97IeXkjeJ0XSIlj3GLBAzDekVM5r2dvQBFbzcZhCsgE9TRQnE90M9j+UigoE/dPEU=@vger.kernel.org X-Gm-Message-State: AOJu0YwNyM2J0WfaF9wZAXukoVZJZdacDf4vgNTF6sE4iJM7x/gAa1Uc ca7Dr5OPSTkJno5bcvWrVwlSL2etq6jm+nzaL/PiN2Q9b8+v74yfw/UvZvNNq5uA X-Gm-Gg: AeBDietLxMA7M0tpR96nLUq2cX9GY2nh/XkJIfV5XVzArD7eefUbJ0c0pGFBmSAkPkN PyICmCAde3zgLiDo/v1U33FnLW4MvchVklOmO8vUaXMHwG3McRPGX1mEfgFQ4q1m6OPjDVx2Q9t shYJTfJQUj+u5gsyHZ60Wnu9jM97YCuSymR0dk7zQe1kQZrpOd1nVB/IZQI7J2YwOxy0Sm7QmFf hup0KtpcMdXy+KTPpjhNWTARcf6Bv/R2yYHhVUYj+OnYDhyykfRDOR9v+GIhISrK5jIsRvzkBpV vLSfB05un/wl///2hPIW/pEruADSl9COTwQ3ws4qU0zLw54g/gXDuT3NpzVYEKhY2RTakBS64Ny O6IxthEvFQ/1db/sNpEeR/rGMtEAgIfWepszA+/LIHRS8v11L5avnowRV24pPWJfpQoLKVQ0hWQ hCypji5zH35qZvr+KvhqB5hkD0aHN4MFY+ffCmuWX/elMd7eKCgmQwzEh6/Y+Qi43ztoDVu1p7/ PN8Z8o= X-Received: by 2002:a4a:e905:0:b0:694:21fa:4ef5 with SMTP id 006d021491bc7-69998cbb3b1mr395797eaf.5.1778018841039; Tue, 05 May 2026 15:07:21 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-43454cbbbd7sm13881595fac.10.2026.05.05.15.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 15:07:20 -0700 (PDT) From: Maxwell Doose To: jic23@kernel.org Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , linux-iio@vger.kernel.org (open list:IIO SUBSYSTEM AND DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4] iio: imu: kmx61: Use guard(mutex)() over manual locking Date: Tue, 5 May 2026 17:07:19 -0500 Message-ID: <20260505220719.44646-1-m32285159@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Include linux/cleanup.h to take advantage of new macros. Replace manual mutex_lock() and mutex_unlock() calls across the file with guard(mutex)() and scoped_guard() where appropriate. This will help modernize the driver with up-to-date functions/macros. Remove now redundant gotos and ret variables, as the new RAII macros make them unneeded. Signed-off-by: Maxwell Doose --- v2: - Remove redundant blank line per Andy. - Put kmx61_set_mode() function call in kmx61_runtime_suspend() on one line per Andy. v3: - Add dedicated scope for guards. v4: - Fix certain scoping in switch-case blocks. - Remove stray ret variable. - Used scoped_guard() in kmx61_trigger_handler() instead of guard()(). drivers/iio/imu/kmx61.c | 98 ++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 60 deletions(-) diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c index 3cd91d8a89ee..1f1a695ab161 100644 --- a/drivers/iio/imu/kmx61.c +++ b/drivers/iio/imu/kmx61.c @@ -7,6 +7,7 @@ * IIO driver for KMX61 (7-bit I2C slave address 0x0E or 0x0F). */ +#include #include #include #include @@ -783,7 +784,7 @@ static int kmx61_read_raw(struct iio_dev *indio_dev, struct kmx61_data *data = kmx61_get_data(indio_dev); switch (mask) { - case IIO_CHAN_INFO_RAW: + case IIO_CHAN_INFO_RAW: { switch (chan->type) { case IIO_ACCEL: base_reg = KMX61_ACC_XOUT_L; @@ -794,28 +795,24 @@ static int kmx61_read_raw(struct iio_dev *indio_dev, default: return -EINVAL; } - mutex_lock(&data->lock); + guard(mutex)(&data->lock); ret = kmx61_set_power_state(data, true, chan->address); - if (ret) { - mutex_unlock(&data->lock); + if (ret) return ret; - } ret = kmx61_read_measurement(data, base_reg, chan->scan_index); if (ret < 0) { kmx61_set_power_state(data, false, chan->address); - mutex_unlock(&data->lock); return ret; } *val = sign_extend32(ret >> chan->scan_type.shift, chan->scan_type.realbits - 1); ret = kmx61_set_power_state(data, false, chan->address); - - mutex_unlock(&data->lock); if (ret) return ret; return IIO_VAL_INT; + } case IIO_CHAN_INFO_SCALE: switch (chan->type) { case IIO_ACCEL: @@ -830,17 +827,17 @@ static int kmx61_read_raw(struct iio_dev *indio_dev, default: return -EINVAL; } - case IIO_CHAN_INFO_SAMP_FREQ: + case IIO_CHAN_INFO_SAMP_FREQ: { if (chan->type != IIO_ACCEL && chan->type != IIO_MAGN) return -EINVAL; - mutex_lock(&data->lock); - ret = kmx61_get_odr(data, val, val2, chan->address); - mutex_unlock(&data->lock); + scoped_guard(mutex, &data->lock) + ret = kmx61_get_odr(data, val, val2, chan->address); if (ret) return -EINVAL; return IIO_VAL_INT_PLUS_MICRO; } + } return -EINVAL; } @@ -848,27 +845,24 @@ static int kmx61_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int val, int val2, long mask) { - int ret; struct kmx61_data *data = kmx61_get_data(indio_dev); switch (mask) { - case IIO_CHAN_INFO_SAMP_FREQ: + case IIO_CHAN_INFO_SAMP_FREQ: { if (chan->type != IIO_ACCEL && chan->type != IIO_MAGN) return -EINVAL; - mutex_lock(&data->lock); - ret = kmx61_set_odr(data, val, val2, chan->address); - mutex_unlock(&data->lock); - return ret; + guard(mutex)(&data->lock); + return kmx61_set_odr(data, val, val2, chan->address); + } case IIO_CHAN_INFO_SCALE: switch (chan->type) { - case IIO_ACCEL: + case IIO_ACCEL: { if (val != 0) return -EINVAL; - mutex_lock(&data->lock); - ret = kmx61_set_scale(data, val2); - mutex_unlock(&data->lock); - return ret; + guard(mutex)(&data->lock); + return kmx61_set_scale(data, val2); + } default: return -EINVAL; } @@ -945,28 +939,25 @@ static int kmx61_write_event_config(struct iio_dev *indio_dev, if (state && data->ev_enable_state) return 0; - mutex_lock(&data->lock); + guard(mutex)(&data->lock); if (!state && data->motion_trig_on) { data->ev_enable_state = false; - goto err_unlock; + return ret; } ret = kmx61_set_power_state(data, state, KMX61_ACC); if (ret < 0) - goto err_unlock; + return ret; ret = kmx61_setup_any_motion_interrupt(data, state); if (ret < 0) { kmx61_set_power_state(data, false, KMX61_ACC); - goto err_unlock; + return ret; } data->ev_enable_state = state; -err_unlock: - mutex_unlock(&data->lock); - return ret; } @@ -1020,11 +1011,11 @@ static int kmx61_data_rdy_trigger_set_state(struct iio_trigger *trig, struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig); struct kmx61_data *data = kmx61_get_data(indio_dev); - mutex_lock(&data->lock); + guard(mutex)(&data->lock); if (!state && data->ev_enable_state && data->motion_trig_on) { data->motion_trig_on = false; - goto err_unlock; + return ret; } if (data->acc_dready_trig == trig || data->motion_trig == trig) @@ -1034,7 +1025,7 @@ static int kmx61_data_rdy_trigger_set_state(struct iio_trigger *trig, ret = kmx61_set_power_state(data, state, device); if (ret < 0) - goto err_unlock; + return ret; if (data->acc_dready_trig == trig || data->mag_dready_trig == trig) ret = kmx61_setup_new_data_interrupt(data, state, device); @@ -1042,7 +1033,7 @@ static int kmx61_data_rdy_trigger_set_state(struct iio_trigger *trig, ret = kmx61_setup_any_motion_interrupt(data, state); if (ret < 0) { kmx61_set_power_state(data, false, device); - goto err_unlock; + return ret; } if (data->acc_dready_trig == trig) @@ -1051,8 +1042,6 @@ static int kmx61_data_rdy_trigger_set_state(struct iio_trigger *trig, data->mag_dready_trig_on = state; else data->motion_trig_on = state; -err_unlock: - mutex_unlock(&data->lock); return ret; } @@ -1195,19 +1184,18 @@ static irqreturn_t kmx61_trigger_handler(int irq, void *p) else base = KMX61_MAG_XOUT_L; - mutex_lock(&data->lock); - iio_for_each_active_channel(indio_dev, bit) { - ret = kmx61_read_measurement(data, base, bit); - if (ret < 0) { - mutex_unlock(&data->lock); - goto err; + scoped_guard(mutex, &data->lock) { + iio_for_each_active_channel(indio_dev, bit) { + ret = kmx61_read_measurement(data, base, bit); + if (ret < 0) { + iio_trigger_notify_done(indio_dev->trig); + return IRQ_HANDLED; + } + buffer[i++] = ret; } - buffer[i++] = ret; } - mutex_unlock(&data->lock); iio_push_to_buffers(indio_dev, buffer); -err: iio_trigger_notify_done(indio_dev->trig); return IRQ_HANDLED; @@ -1419,22 +1407,16 @@ static void kmx61_remove(struct i2c_client *client) iio_trigger_unregister(data->motion_trig); } - mutex_lock(&data->lock); + guard(mutex)(&data->lock); kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, true); - mutex_unlock(&data->lock); } static int kmx61_suspend(struct device *dev) { - int ret; struct kmx61_data *data = i2c_get_clientdata(to_i2c_client(dev)); - mutex_lock(&data->lock); - ret = kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, - false); - mutex_unlock(&data->lock); - - return ret; + guard(mutex)(&data->lock); + return kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, false); } static int kmx61_resume(struct device *dev) @@ -1453,13 +1435,9 @@ static int kmx61_resume(struct device *dev) static int kmx61_runtime_suspend(struct device *dev) { struct kmx61_data *data = i2c_get_clientdata(to_i2c_client(dev)); - int ret; - mutex_lock(&data->lock); - ret = kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, true); - mutex_unlock(&data->lock); - - return ret; + guard(mutex)(&data->lock); + return kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, true); } static int kmx61_runtime_resume(struct device *dev) -- 2.54.0