From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) (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 DE4C63537C0 for ; Thu, 7 May 2026 22:33:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778193221; cv=none; b=ZcGI6L4Lt+rjkeIi0DqYwLBztYaetqjRVyj6AK3UzJcz4HtLljKJeGJcKBzgLjpTJFXIGXQsA0ATbN910sZmbwelBu+M50eJQzjWlYzLK79HHONkrtRvdwQ+6BEhVcs3O6InQPnwH+2LmNiMtQoidZF3+ISTOsKshMifqQR+XTY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778193221; c=relaxed/simple; bh=vAQnHWxWMSNVh2a676rEuUjl0h7Nrh6Wlb21vb1bD/Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HCtK0XE2ITHxoYla0Jh4mZUanl6FRxPpwqUPMtT3whMmgGTdEhmKznIM1EYsbhHrfpvdqXRhS7tyIgS+sYRU17kFbTYokLu0j169/LDCod8lW66+TLrsZW/2yAJ3WlZie+zIfZlMdZxepBorP+Qgc1SECgg99AYFqT2NdtdkBd8= 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=mP95xn/5; arc=none smtp.client-ip=209.85.160.43 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="mP95xn/5" Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-40427db1300so1015042fac.0 for ; Thu, 07 May 2026 15:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778193219; x=1778798019; 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=iQQUFa2MU4ye3M1dexG0k5SD3Kqn89ob1cFtn0xTS50=; b=mP95xn/5yOj+HQMB1ZTDaveHBfgPbgIN9NwRP3cJ4DlruE0/3095XGWZ01+7XuT0fd 5bvgSwA+Grh8Yq0NAfk4S/QQEXAzFJLiO7FRpsh9JQXHsFSkxXhjOTA5xcX30JAVtMR3 uPsUvgNe7JkiNlfIkRdpNIISs8IC+V0bdwgzHKF7HOIRXuGSBmNfJDS5E6PfMClvAgyT vWcJZLmyGDKv0dYbb1xNyOoBNMyfqahtP8KCquZv9wYUNw/340++RI63c5+nNJi/bFoK eYz8FaNXAZ6msTWfI6ItJBCfVswio1Kg7pzjpXkuAYSfpBBpQTmakuNMqu5h/g47gs5d 3vVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778193219; x=1778798019; 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=iQQUFa2MU4ye3M1dexG0k5SD3Kqn89ob1cFtn0xTS50=; b=kBl194JvjUP/7c6VMuhoqwyozlL8rI8PtuGuqdOsDU0vrWNG8IS2OAanceheaF5sSG +0Mdh5BzJUi1kUxOX3PdV6IL7iRYW6Xe8x3iMuQklFdaYhQDjll9Ia60YvFXXCoaPlcb h7F/Htp1U0tIKmtrZqQi2pTA5fznUHF7MNIkEMUYj/+bwR0hFjrNRtHp/PUNYS+AwJjN 5ANJrbbwhOq46LAvjlum8WjHO2voNHB3eYKcLJyKC9Xz7nTzJ18e6Q8XTh0aQrEm1+Mh 98u0VJoeDdH0oEOD5q/LO3wI96Pi5fAf4o81sj3S6jgrWgdlTf20/K9uyvN3bBdKItXL 2WIw== X-Forwarded-Encrypted: i=1; AFNElJ8wP0U7JLRv3RJnScP/mFJI3avLD6W9LfiAx2kC347kUgLw6+tbOpMh99bo8ECCPNMF5MZwmSJH1mFuY0k=@vger.kernel.org X-Gm-Message-State: AOJu0YyW6XirgE5KQgpOakLBTZSqkUUaL0cl0dBQdpNmQu9NSjF+yAdp Ic2zvWHtG2F9hL2blgbavUvhHOdBK9Jk3vsza2tcfCb+ZTRwKTXVmUIxusC+x2Uf X-Gm-Gg: Acq92OHVJN9uxNKbpc2ECEMh23EG+Er8alyq/NdNrR+9MPtn4b00HP/jaddZhv2Abvy LzVb9WrHO8mXaupZZzJxMt4vy1P3vxjpsMt12a7EdO41mljBv3MoPj4NKmxzCkNyBKC6fNK/8ID Wt0aVCh1OtNknncs+4aoODw4t7CHeTPPoVECIzeNwQc5eG7jYxBgKSrmDroRtA4ugUURGV5nGCe VrzN6JfH7b0vSfoqLjGNSngiDvJ5hbn5fEwof/+MHwrJzeL5t8ms+/YyG+QcF+fLTewOvJEUiQt YfAEBx/8DlsSkdX7lhxTMZ9dIHnpgwz8IGlK1JgH5n0BWBmBOU/da3Ex+BT8Rl53nFxbicZUYst yjTyiROxO/8kBIQFTI5oYcegBnXcOLBRlE8mInOIK9garpjcQTBs0kLHnhBMRtVUyNesVzMkh1f Q8xT3LKYxRhsyJ0rRpVr7dnIXZThzfXbTPBzsq6XfbigL3iq4eJY63R6O3Hg== X-Received: by 2002:a05:6870:21d2:b0:41b:edc8:7b93 with SMTP id 586e51a60fabf-434f4e27a97mr6142209fac.0.1778193218617; Thu, 07 May 2026 15:33:38 -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-435571099a4sm97145fac.7.2026.05.07.15.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 15:33:38 -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 v5] iio: imu: kmx61: Use guard(mutex)() over manual locking Date: Thu, 7 May 2026 17:33:36 -0500 Message-ID: <20260507223337.48437-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 to simplify error paths and eliminate manual locking calls. Add new helper function kmx61_read_for_each_active_channel() to mitigate certain style issues and to prevent notifying that the IRQ is finished whilst holding the lock. Update certain returns, and add default case to return -EINVAL in kmx61_read_raw(). 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()(). v5: - Added new helper function kmx61_read_for_each_active_channel() per Jonathan's suggestion. - Add default case to return -EINVAL in kmx61_read_raw() per Andy's suggestion. - Add blank lines between guard(mutex)() calls and regular code per Andy's suggestion. - Change last return statement of kmx61_write_event_config() to be 0 per Jonathan's suggestion. drivers/iio/imu/kmx61.c | 125 +++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 59 deletions(-) diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c index 3cd91d8a89ee..fe3f357c8889 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: @@ -834,41 +831,41 @@ 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; + default: + return -EINVAL; } - return -EINVAL; + } 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,29 +942,26 @@ 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; + return 0; } static int kmx61_acc_validate_trigger(struct iio_dev *indio_dev, @@ -1020,11 +1014,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 +1028,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 +1036,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 +1045,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; } @@ -1181,30 +1173,52 @@ static irqreturn_t kmx61_data_rdy_trig_poll(int irq, void *private) return IRQ_HANDLED; } -static irqreturn_t kmx61_trigger_handler(int irq, void *p) +/** + * kmx61_read_for_each_active_channel() - Read each active channel into a buffer + * + * @indio_dev: IIO Device struct to read from + * @buffer: Destination buffer to write to, the array must be of at least size 8 + * + * Intended only for use in kmx61_trigger_handler(). + * + * Return: + * 0 on success, negative errno on failure. + */ +static int kmx61_read_for_each_active_channel(struct iio_dev *indio_dev, s16 *buffer) { - struct iio_poll_func *pf = p; - struct iio_dev *indio_dev = pf->indio_dev; struct kmx61_data *data = kmx61_get_data(indio_dev); - int bit, ret, i = 0; u8 base; - s16 buffer[8] = { }; + int ret, bit; + int i = 0; if (indio_dev == data->acc_indio_dev) base = KMX61_ACC_XOUT_L; 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; + return ret; } buffer[i++] = ret; } - mutex_unlock(&data->lock); + + return 0; +} + +static irqreturn_t kmx61_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->indio_dev; + int ret; + s16 buffer[8] = { }; + + ret = kmx61_read_for_each_active_channel(indio_dev, buffer); + if (ret < 0) + goto err; iio_push_to_buffers(indio_dev, buffer); err: @@ -1419,22 +1433,18 @@ 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); + guard(mutex)(&data->lock); - return ret; + return kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, false); } static int kmx61_resume(struct device *dev) @@ -1453,13 +1463,10 @@ 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); + guard(mutex)(&data->lock); - return ret; + return kmx61_set_mode(data, KMX61_ALL_STBY, KMX61_ACC | KMX61_MAG, true); } static int kmx61_runtime_resume(struct device *dev) -- 2.54.0