From nobody Mon Jun 8 14:35:26 2026 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 308B636A352 for ; Thu, 28 May 2026 22:29:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780007350; cv=none; b=GmZ9Amot7eIv/nI7s14XPsmgW7NYJz95E9X06fxNkFgiy+PnpmwQqQlPJiX1V+pw8HRnBKy83ZcF09SCFtnghjVlR0O5YP6LfHMe6OL5B9IiASqVQDvN39b4nnUBcg/Izd759rR+phCm2O9Vo12K5S4oBraPmAeTItYs3k+GIpo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780007350; c=relaxed/simple; bh=rDeyzMJXO979faPEvGKzUCydD+AKhDwrae9AxvYno3g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RklgcFyNlp4SOdZiXr+Fz2EW3uJlZBp1sfDvjUBU+oGYykAt4SPirLy51xQ4lP0IO9sh3o+vpHCVWAvBtwsTFT2ybh5j5A19mcNkjQEWQOAHcp09l0XJwo3RqV7uvsiGM4/a1/cKqG1XjOwJxs/8RWk2FBvZHXJCzpm82wGIt1o= 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=czSRccnV; arc=none smtp.client-ip=209.85.222.176 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="czSRccnV" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-914cf9248ceso475298785a.1 for ; Thu, 28 May 2026 15:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780007348; x=1780612148; 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=BF/CcGwAcMn3gialDwAGFBOUWdz2cgvE1Ykftev8rrA=; b=czSRccnVX11bueILtqn3/uV2SZ1kPYuVoYaj8Ho2iVZBHmh0fbreFn1TF8SgkiL/lJ OIOlO88BU4oxwWb+kFUGCs1tfq7jmV1kxM3/jnSZtSNbX2Kzl6pnz7osigtCCRTJs2BR 4AJLpoEEfRqfQz89hnv1ZUUKHMwQIREkb9hhMY7+5dsuarNbN1HGBqMzcGRjaUzdLlbk 1KbNx7XIOIMrXuJiEd+VwNNDD/Myo7vxrQc3UooztCnuWv7bdwVwMzuMQ7IczUFlZi3c BuQ6E0GwEqn6ayZ7Ohp6xTFcDYAFopPGfQcKP39SBkHFxNelBvIFWeoIqXjBOl9S/MCG GSdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780007348; x=1780612148; 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=BF/CcGwAcMn3gialDwAGFBOUWdz2cgvE1Ykftev8rrA=; b=aq7/t9eBiIJs50GyRWYRePg4cwALokg/yokw0e7a8lZAcFIMLUWWFch1zU0wSLdwQR QKWwWN85kw0FXR3Jol1POzFI+7pNXUfWBsaXqFySwQmxgbU9qtGReC8L9weBx2A9dH4H r0452hkspJVxY/SQf3+9wRRV3pUmPF2aHDwJCA75jWrj8pwp/+FepK6yavhgeineekOF ANmFoE0CFirDeGKOREtIQw0VywiH94FEdCTGp677B1bQoctAeDGRtY4dKVi5SY5ds0c3 HNVQcF7vKjL4k90SL1SvpWc23Nf50og3k+6wjI5GRc+o0X+Fe7NlgPsU5IjyFTVZ6M2L LztQ== X-Forwarded-Encrypted: i=1; AFNElJ9O3btY4Efi49F5a1TNr1b+FVMllgeG7YJGRk57/1qCCP2WPRzepPoDDA3Ed438jiTtkTjwFA+1cfZYzCM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3b5yG+aSHfbWz5di15Ty3/lhLrEvKram2YPd+7yQdI7rDRonM ff5yKImPIq6xyUqpxHdt3VA6lvq/4q/4RMLGtvo1qYcPNd/sm3Egr/uA X-Gm-Gg: Acq92OGS5LNYGwYEp2a4DYjd7PL8n+WTnkxL7TkjzdyyiUUbTifLV1jajHTeMhmO6Vl gmg+ymZa8euTrdoD77muPlafcdqKzq6lAS9LFJTzmQnMG/DGg1AwNUn8+VpSSErRNAagexsram7 eDQZSLVtUgkAd6Pdl7TfPMEVwTqVL9XhC4sa46X7S/Uia8CZIv/4bfhSxSbTfapjGDW4thgooDd eeSEdHTPrhH59NMf0s/Cm85EX3ThMVmbdySMdDUasw57l89LRs0xinQARmt965xxgN6boPEfqVr sgZLNnFI84u3EX5pDUXyURHyAUGb80G6EYxUAwOCRNbEr2788EOQJNHzUbrXed615doj99873bE YO0hJKcjVlvS8ME138PSJmXRr0BeOHk1wuORbqNh/kuEBE2g3bdcGJ0aCV4xAc37VWPEVPWAANh XlM5oDBCePR2U7Q7MpshgmdBnJZgdPGdqaACHuXpn9DMamOSSquRJmHjCKE0GzZL5XK+A8 X-Received: by 2002:a05:620a:404e:b0:914:afa9:a41e with SMTP id af79cd13be357-9152fd031dcmr42430285a.22.1780007348051; Thu, 28 May 2026 15:29:08 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id af79cd13be357-9152fd416c7sm19409085a.11.2026.05.28.15.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2026 15:29:07 -0700 (PDT) From: Maxwell Doose To: jic23@kernel.org Cc: Tomasz Duszynski , 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: chemical: scd30: Replace manual locking with RAII locking Date: Thu, 28 May 2026 17:29:06 -0500 Message-ID: <20260528222906.61561-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() containing the critical section for scd30_trigger_handler(). 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. v4: - Forgot to commit changes listed in v3, now fixed. v5: - Remove unneeded comment for scd30_trigger_handler_helper() per Jonathan's suggestion. - Change name of arr_size to scan_data_size per Jonathan's suggestion. - Change type of scan_data_size to size_t per Jonathan's suggestion. - Added blank line between return and the rest of the function body in scd30_trigger_handler_helper(). 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..20258059f915 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 +static int scd30_trigger_handler_helper(struct iio_dev *indio_dev, int *sc= an_data, + size_t scan_data_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, scan_data_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