From nobody Sun May 24 19:33:18 2026 Received: from mail-yx1-f44.google.com (mail-yx1-f44.google.com [74.125.224.44]) (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 B199786329 for ; Sat, 23 May 2026 04:57:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779512263; cv=none; b=fZi6F34tbPe2cBFbuZW0I+Nuy1NkQYNCIumRCMJfzSAAhhSUyCrUMmO61F0K9c6MdL1Bm8DJzPSonL6zpky0ULfSd3VYVaNF2WhoRlkK5TsE+c0H38HHZONWhZP7FIXUPEQxtVQeT6hZbXPTqwXcUzHqw26iMh7xB2c6HaqZuiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779512263; c=relaxed/simple; bh=AibGuK02mewGLsMoI5Ej9fpXEH3UuYsIlpptGZJ+P6c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aarwUzykJjOKr06fgBmq4poXru6bYhokPSlE5TOWN35pcn3Uc2pLLpSwTFOVuBDcax7TbMI3/wIIlBr0w/olSMMGtk+A9IKXBHDx5qsMZD5LUg7mLn4K58HYtBa+eCT0uLyObvcWtGsP3+lBIXt3cHhkZh7ee9ScC1g8C3goQVk= 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=ShlrLF83; arc=none smtp.client-ip=74.125.224.44 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="ShlrLF83" Received: by mail-yx1-f44.google.com with SMTP id 956f58d0204a3-65c1ba7eeb6so7979483d50.1 for ; Fri, 22 May 2026 21:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779512261; x=1780117061; 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=5syWGl+5MvohUYzgLrTITJDD9QNFSwgW5FKEfbY3xMs=; b=ShlrLF83aWpgNZlV8GnGbOxnyllMrkgBlW/odKMeWbnJDQwl3aEFQ5ewGEsvpIIcMs /sEHyEWeyHWsji2wTfi0A1Hu1N+dIz10H3yEp4RGXKvoyK5hiyrB3cjbIVQen7cb9XnU jSuuWOAfqZhNxNDQnM55V2ALv1v0q8nTa4chwU7unAjiXzO12bMl+gV1EiEd+CSGrlXX sNTKshfNzaARATRIa3eZy0f2zmlnhEpyZJQT9qZ0ZWakurjRwChrUKFFq0DYonM6ECDm jNmDTeWf1kAIWKIH+CP24usZNi5jBkZM20giwNRJn3N/K+GsuUNhniS6ZMSHxrQc0aSk QV2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779512261; x=1780117061; 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=5syWGl+5MvohUYzgLrTITJDD9QNFSwgW5FKEfbY3xMs=; b=Kn0trn1zkNZkqo9GSqmsrrAUXhprV55izOgaCes5YyeYlSO5y6cs2Yog/ddweE16Cl CYHtesBe5BODzANGGyVeM/e7sC6Xv1H/GXDJUmAynBjlTckeYtldqnE9SMbJHIQdYFdJ 6jdviw3CR6uK/7mnerMgSIP8MPdl0HoXNccw1zYBA9jsn9GMXeEG/0JKXXkjhpsBEn/z QEEY2hCX8divtz8vUwi7mpMkmKQ0gxYtwWMHvbt+9R73ncol4Zhqch8FFT5duUsG5mxW RfIY56afPnQAgwNchxnLbki6ggYRYkMpB7EcXqaww1Q/JzMs3e2VMn7EhefHmhxMpeYH rXew== X-Forwarded-Encrypted: i=1; AFNElJ9Bf29q6PPtpGLbWeRPGS77wqdoXlRll5nxPRzzJVNJcLgNdoXyV+g8ukTizr8ANYN6iUIZmJCniHpB2rE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywstiw5fdl+x9noygx1ivvrfA2Kh4xtrfSlpHNHRNN71x2tBaAG J7wYdMbt0UjOmzzOr9VSoslxgpIjowuqAtwp4FaELVrKBUc1RipFijW/ X-Gm-Gg: Acq92OEe9jqV1fo74jZ9jWsvDBVB/qkP8ZuTbr3x3j8JAeYu1sWfB4DQmdp8GiscwHk UgEkvu33QLT58pGo0VfooWzyK2HwukvThxit+1jEpoRY5eqVhArxVHZmn3uVI63+cLm862D/m8u tOniEXq5GdP9bewROR0IRSTVaSQoRfOUZl8vggzVC8peRaygme/smSu2CK6W04YZjGgMZtM6CI0 0qsXxU/3uu73U1QwZUCqYP8N+gL4vh8rZbWDvK7MhrxXrV2GI9Ry4GpLzMRx3+J6M9h65F+12jT IlVnYArtxDywPRJeFK4HpStJjRn2bagaMKrgEX7cRx5VlD5nvY/KxMNuFM8934b81YxJ6MghP0U DGgI/Eh4Em3Vzd06F5tqdR+nQE+4UlbZvpvJhgq96C6GR2aYqm6bxf1q7syRa0cashGhriAxgXn /rRfxIWmIvX8cFT1maytdrw7EDkA== X-Received: by 2002:a05:690e:4090:b0:65e:421f:25a with SMTP id 956f58d0204a3-65ec9938b9dmr5900496d50.53.1779512260714; Fri, 22 May 2026 21:57:40 -0700 (PDT) Received: from i-use-arch-btw ([12.216.126.78]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-65ecfd5c17csm1615321d50.10.2026.05.22.21.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 21:57:40 -0700 (PDT) From: Maxwell Doose To: jic23@kernel.org Cc: Maxwell Doose , 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 v3] iio: chemical: scd30: Replace manual locking with RAII locking Date: Fri, 22 May 2026 23:56:09 -0500 Message-ID: <20260523045610.30925-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: quoted-printable Content-Type: text/plain; charset="utf-8" scd30_core.c currently uses manual mutex_lock() and mutex_unlock() calls. Replace them with the newer guard(mutex)() for cleaner RAII patterns and to improve maintainability. Add new helper function scd30_trigger_handler_helper_locked() containing the critical section for scd30_trigger_handler(). After moving scd30_trigger_handler()'s critical section into the new helper, tune up control logic to return ret early and not memcpy() if it's an error condition. In addition, small refactor to replace "?:" operator with regular if/else returns. Signed-off-by: Maxwell Doose --- v2: - Fix callback issue as noted by Jonathan v1. - Refactor critical section of scd30_trigger_handler() into helper called scd30_trigger_handler_helper_locked(). - Revert removal of goto in scd30_trigger_handler(). v3: - Tune up helper to return early on failure condition per Jonathan's suggestion. drivers/iio/chemical/scd30_core.c | 66 ++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/drivers/iio/chemical/scd30_core.c b/drivers/iio/chemical/scd30= _core.c index a665fcb78806..bb8bdea7c833 100644 --- a/drivers/iio/chemical/scd30_core.c +++ b/drivers/iio/chemical/scd30_core.c @@ -368,11 +368,13 @@ static ssize_t calibration_auto_enable_show(struct de= vice *dev, struct device_at int ret; u16 val; =20 - mutex_lock(&state->lock); - ret =3D scd30_command_read(state, CMD_ASC, &val); - mutex_unlock(&state->lock); + guard(mutex)(&state->lock); =20 - return ret ?: sysfs_emit(buf, "%d\n", val); + ret =3D scd30_command_read(state, CMD_ASC, &val); + if (ret) + return ret; + + return sysfs_emit(buf, "%d\n", val); } =20 static ssize_t calibration_auto_enable_store(struct device *dev, struct de= vice_attribute *attr, @@ -387,11 +389,13 @@ static ssize_t calibration_auto_enable_store(struct d= evice *dev, struct device_a if (ret) return ret; =20 - mutex_lock(&state->lock); - ret =3D scd30_command_write(state, CMD_ASC, val); - mutex_unlock(&state->lock); + guard(mutex)(&state->lock); =20 - return ret ?: len; + ret =3D scd30_command_write(state, CMD_ASC, val); + if (ret) + return ret; + + return len; } =20 static ssize_t calibration_forced_value_show(struct device *dev, struct de= vice_attribute *attr, @@ -402,11 +406,13 @@ static ssize_t calibration_forced_value_show(struct d= evice *dev, struct device_a int ret; u16 val; =20 - mutex_lock(&state->lock); - ret =3D scd30_command_read(state, CMD_FRC, &val); - mutex_unlock(&state->lock); + guard(mutex)(&state->lock); =20 - return ret ?: sysfs_emit(buf, "%d\n", val); + ret =3D scd30_command_read(state, CMD_FRC, &val); + if (ret) + return ret; + + return sysfs_emit(buf, "%d\n", val); } =20 static ssize_t calibration_forced_value_store(struct device *dev, struct d= evice_attribute *attr, @@ -424,11 +430,13 @@ static ssize_t calibration_forced_value_store(struct = device *dev, struct device_ if (val < SCD30_FRC_MIN_PPM || val > SCD30_FRC_MAX_PPM) return -EINVAL; =20 - mutex_lock(&state->lock); - ret =3D scd30_command_write(state, CMD_FRC, val); - mutex_unlock(&state->lock); + guard(mutex)(&state->lock); =20 - return ret ?: len; + ret =3D scd30_command_write(state, CMD_FRC, val); + if (ret) + return ret; + + return len; } =20 static IIO_DEVICE_ATTR_RO(sampling_frequency_available, 0); @@ -579,24 +587,34 @@ static irqreturn_t scd30_irq_thread_handler(int irq, = void *priv) return IRQ_HANDLED; } =20 +/* Meant ONLY for scd30_trigger_handler() */ +static int scd30_trigger_handler_helper_locked(struct iio_dev *indio_dev, + int *scan_data, int arr_size) +{ + struct scd30_state *state =3D iio_priv(indio_dev); + int ret; + + guard(mutex)(&state->lock); + + if (!iio_trigger_using_own(indio_dev)) + ret =3D scd30_read_poll(state); + else + ret =3D scd30_read_meas(state); + memcpy(scan_data, state->meas, arr_size); + return ret; +} + static irqreturn_t scd30_trigger_handler(int irq, void *p) { struct iio_poll_func *pf =3D p; struct iio_dev *indio_dev =3D pf->indio_dev; - struct scd30_state *state =3D iio_priv(indio_dev); struct { int data[SCD30_MEAS_COUNT]; aligned_s64 ts; } scan =3D { }; int ret; =20 - mutex_lock(&state->lock); - if (!iio_trigger_using_own(indio_dev)) - ret =3D scd30_read_poll(state); - else - ret =3D scd30_read_meas(state); - memcpy(scan.data, state->meas, sizeof(state->meas)); - mutex_unlock(&state->lock); + ret =3D scd30_trigger_handler_helper_locked(indio_dev, scan.data, sizeof(= scan.data)); if (ret) goto out; =20 --=20 2.54.0