From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) (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 A7A3C1D88B4 for ; Sat, 2 May 2026 03:24:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777692299; cv=none; b=mM8uSAZ5Z8EcP0Ygea63GOU214Y/EBr79D59XY+rEMFqJPUqCNTvfMcLbPr+0mVxorEwDGudGltjznC13pMXwtIicHgVJmBb3TVphkJ7AEjJpEqX2gGHwhDM4CDG+jjxm2H/WQqDfKaGbHc32wdSZapRFUK7VxBrffUxa8o4v/4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777692299; c=relaxed/simple; bh=Snru09MHa4vdSSTFJ8++k8St5RVIbamL6q4e3ltXeII=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=P9hVoRuZKrRg/YhFakKkOXRSLwRnLmmiDZj3OiB5XOmbN/kYwZ05DnchomAFpGFChhC2PMnLAziV3fQBbjI69y0zJhaJOQXVXSKbjcvCjDo3US2W0CB1L2CRVlgXUu7FZt2+7KIDBGFIM4deSrgg6QMD3H63iQ1aEDySKP1C7UI= 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=O6kxFIhX; arc=none smtp.client-ip=209.85.210.41 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="O6kxFIhX" Received: by mail-ot1-f41.google.com with SMTP id 46e09a7af769-7dccda31d3eso685441a34.3 for ; Fri, 01 May 2026 20:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777692296; x=1778297096; 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=FoyrhWs5FG03vrGQrf82zp9nJimCyZ0v4w/3/GCSuyk=; b=O6kxFIhXahgOnY8a6tWlpetV6tbydWImYEtOGmPP+c2F3vCMfzYVjBi05pYP1QRW+j SMpB2EASLh1WMAPyYq7eOTDc1dTRS7BffOwP12oN6rf67rl10NII2kJQC3uVkzEcC6nB qxzCi6tZ2l4bVMBL8fKy9MuumoL/XdMZprpLffgQuuH/XanmKIesnTyR+5UFWU75PtIV 3Ht5Mr7k1ecSgwIHzcwW2ULj6zvwSDJlQ/v8U8ddUjy1kBgmkRLjhWupuAuzCo34t7NS M5ztDzAd8fgzXvqqk1VljBF5fcOM6OFQErY1T53EIR0fUKy4bRmVmBqqXWqFJkwAXQL0 J2BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777692296; x=1778297096; 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=FoyrhWs5FG03vrGQrf82zp9nJimCyZ0v4w/3/GCSuyk=; b=BfEIuEy86efhLa6FDpVt/fMfNU/fxLHqjVpRqUIu4s89qZ5LgAHbjhjEB8rOWssXny z/8qS8nc+8g3VGKZge1b+ulwRtJWEWiHrPHlh4CrMtg/sEUeQmiPyTVsZsSEiimXunT5 6aFpSXLXPnKhFHn2dZF49TnpoAT/coD87gWADpFIrbBPFyoIRfqsIBRbu33VdDP4yzxY OwCqfrbeZHo9FVH8XThvFNFGO69bcS4qR6DimTFgHEkUAiUQVIlkkaPp17luLHd9paZe P9ibhSrzV58zk1n1c0Xh+6kke6nta1xoJn/Ku77KdMvkiPsszGpgdbZHyeIrKIRSj5pg iCbw== X-Forwarded-Encrypted: i=1; AFNElJ/wQUD++UMb3TaPDfKdusSeqZY6VDTu5rbxBBui+wQPUutv32iQIi7ys24Y12mVIuTU+z+bMD93MzT4o48=@vger.kernel.org X-Gm-Message-State: AOJu0YzwwJ/AkVac1Yj4oH8lI+rv/tp8H1vYfop6so/XOATghjn8Fkr5 88M00/3oOPCWQYZIDJCGBwgagsWlNNmJ3X3U1uwZtHgBUCiiB5AyMkU8 X-Gm-Gg: AeBDietiNiS8YO/1wfrcgpA4V/9rtuS999YgXsJgZMpkfu4jGEqK8Y9AdDFJV3OBhHs Ju8/QoMU+9D7fUxSvSgDFSLhRxLvAA0R9LfKlw2sU9hqeVI9+Xk79XOXgV2OwfMG2VLofq2yv3b wSb2FVR9Ztwysqzj+QeVjsaYUBYZKPBpINjsoi6hXGaAavcasAu723ybA0tIZG8oY57Hlg5jd9e XNIpuPamG/oRv2mj7/a0F2lla9kPzb3BWsypDlm6xUrod9kGsGvMTv+LqtwgVW+uFCGUZ1Vg1d8 lW/mRdhF7ZXgIad60zmQdnITFwYDuVzUuP8fyhy833yDh5ZkR1DnU+AVsvmHbio4wxqCOwqk3Ts UYXAq860dIMQxFVdj4ZIuQSjBgVoNts0B7CSdgx8pjQWA9UF68I0m5jWGIXpRoRNsMm4m6uu0LD KQcr0biD+Al4XmcpCy2gk9GN+NRQyYlHvhsdzAIbd6775NSIqzsOJymN7HHDhSkz9yM+7F X-Received: by 2002:a05:6830:8292:b0:7dc:cd0b:58af with SMTP id 46e09a7af769-7dee121603bmr1263755a34.6.1777692296566; Fri, 01 May 2026 20:24:56 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ded51a9612sm2272396a34.26.2026.05.01.20.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 20:24:56 -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] iio: imu: kmx61: Use guard(mutex)() family over manual locking Date: Fri, 1 May 2026 22:24:54 -0500 Message-ID: <20260502032455.76107-1-m32285159@gmail.com> X-Mailer: git-send-email 2.53.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 --- drivers/iio/imu/kmx61.c | 74 ++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 49 deletions(-) diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c index 3cd91d8a89ee..2baaca129601 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 @@ -794,25 +795,21 @@ 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; @@ -834,9 +831,8 @@ static int kmx61_read_raw(struct iio_dev *indio_dev, 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; @@ -856,19 +852,15 @@ static int kmx61_write_raw(struct iio_dev *indio_dev, 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: 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 +937,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 +1009,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 +1023,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 +1031,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 +1040,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 +1182,17 @@ static irqreturn_t kmx61_trigger_handler(int irq, void *p) else base = KMX61_MAG_XOUT_L; - mutex_lock(&data->lock); + guard(mutex)(&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; + iio_trigger_notify_done(indio_dev->trig); + return IRQ_HANDLED; } 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 +1404,17 @@ 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, + guard(mutex)(&data->lock); + return kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, false); - mutex_unlock(&data->lock); - - return ret; } static int kmx61_resume(struct device *dev) @@ -1453,13 +1433,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.53.0