From nobody Sun May 24 18:41:04 2026 Received: from mail-vk1-f176.google.com (mail-vk1-f176.google.com [209.85.221.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 CE6862F531B for ; Sat, 23 May 2026 18:19:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779560344; cv=none; b=NeccRqLUJJDyBFwlK5vutW9TnLQ4yy+bGSpbvOJSgr35VRjf16vrvI2Yofhxxmii0yi5ayoWkbAkvSFLosD5O3Poqv5FxxcL0sizf9Vk7DKsPrVsx6d6+kLqlz1WS8YJBDn4u3ZoVFfedGSde17uEpDlXGA8ykL1G4IGxbzWsTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779560344; c=relaxed/simple; bh=TXlBbCeRQpAYKjtSbtq8dWRX7Lp+ozqkl0FyiHx88e8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rinWgMUStop0vjnBzpjZwgb3Mpk/OroY4C0J4qTS4cWKmv28o7zgkga5N3hIOZ2eRJu4mo7hDYpQWxyIFMPDPM1D00aKgY4eJv9SkKOBS9tiz5ijjyoYoKi/PXes5GyNjJR1XT23pWFZ3EqIbiDW3AABzCG6ZBSnM0AFRXR7vhE= 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=i+EnmcTv; arc=none smtp.client-ip=209.85.221.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="i+EnmcTv" Received: by mail-vk1-f176.google.com with SMTP id 71dfb90a1353d-5780c38ecb8so5890379e0c.2 for ; Sat, 23 May 2026 11:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779560342; x=1780165142; 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=tyeD0OdnYGf6nkKpDLnXOKcxqGSyQT6SnIZ/nCi0uWs=; b=i+EnmcTvgLIilzrh0/PBcZTth+drSVmgu62bT0CNo0hZcypp9y4Wyqhj9tMSiaVgZ4 JBEbj3E+OA3kG41IOG/E9523++16KG6d0kLGXRNi8K5S73GpK0MYohcUwSeYCsOfHp+f qM3pbqUmN0mFbDyHWcR9NTo8lrLqNhs5efV5TqjdnVJY/XD6LLViheabVKs5VEw4aPRp GYrUsqpRXsW660zgqDZBuO5VILSuyHyYhigVNC3SZbCQfI/gMwFNCKArYI16tu0j0Rur p8gJ+JVA/IGCPG3jh2ZVrPFStfJuQwBjP4XoD/YtQoypjI0X1AUqX0gpdOmdASr0IMDe VKvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779560342; x=1780165142; 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=tyeD0OdnYGf6nkKpDLnXOKcxqGSyQT6SnIZ/nCi0uWs=; b=bgTsGjanfEz7+djp6v2hp0bTz3P7RywbjSVD7X9GwR+8qJc6m0M0GLEKVKF3G0j22e Pe3o1wOz0vBiZjQbhZ1/IJohLqRRt7OFtQ/mecYig6iYuHsRms77acaH5CqmmeZLhNI+ PXT/h3PUdhfuz9fzqmmytIPKNQ+oLgZTxDwaAalUnSGmhCJhwPu3t10Ymch+i1Su8hAB yShBzZb1Cwn3VnTVL6FyDrMwkjGt8pZoUYW3x6M3DZTNZ/unsTV+vra1F3yedFQ8fgeC aLoIYLqEHvyx1K53dsL+4HQOhzl7YToM2QZbJlV5q1eI2Y/dOGuc9pKrDGxYzPS5jbOv Mu/A== X-Forwarded-Encrypted: i=1; AFNElJ9TQPK5eG0AIlxGLLSv8D5kVGRyWbsxerBH8KeZoRoc++1K37hDkg+7aI2Aa50zkHBJD32zKrzMlx1d6rQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxjmGfH3o1WPHTu1z8sgRpn+rCmuPTHvAot1Uwphp6YWQ2QS0a2 xP45veqQdDZU1rSKYYbxh+zmP1Ae43iEsS4ig2rgPArktocaBD6WavqM X-Gm-Gg: Acq92OFbjFuUDdnV1aLryhpYJCrXtCpVZ+fAexfm9R4ewQW0fGwnx31+4u9y0f4lk2B Q1tHtXeEBRNrdVOvgTHFS34crM9ikHTsTNiA6Yz3hj2YZP77VNzndYe2+XB8ekvP/z347KUIRns MocXjabD/Agl3MMQhfls+cywMjU2OFzFbhow8hwSzgsSQUFOR1qEjXKYOTFGVMJZfEdgo2NumT4 OchyyQ8dMa1p4VX985TwF9sJdJMqLqLj+9awxU6riPH43W3D4U2lgKCbqRmWTFxYR97yLPEo+j0 0CN3kdINMasjxHXXT3GZv78H026Ex2iQ7jqLmLM8oggPIQoAqKwTl1wLXyPVPnTzrbEJsW0ITpo P6q9vI49NbQfusKSacDiMPtC6W/nIrsodQFemqG7euH2s+0ZziogwleUImfls496psD1ujUanl1 1N1THx/Ai5pYFb4yfpP0PcD47XuUC0ng== X-Received: by 2002:a05:6122:924:b0:56d:451b:e4dd with SMTP id 71dfb90a1353d-5866395de75mr4709856e0c.12.1779560341744; Sat, 23 May 2026 11:19:01 -0700 (PDT) Received: from i-use-arch-btw ([2600:1006:b017:e193:bca5:670c:e4c:71ed]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-586f889e7e3sm6493090e0c.15.2026.05.23.11.19.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2026 11:19:01 -0700 (PDT) From: Maxwell Doose To: jic23@kernel.org Cc: Maxwell Doose , 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: sps30: Replace manual locking with RAII locking Date: Sat, 23 May 2026 13:15:36 -0500 Message-ID: <20260523181536.5254-2-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" Replace manual mutex_lock() and mutex_unlock() calls with the much newer guard(mutex)() and scoped_guard() macros to enable RAII patterns, modernize the driver, and to increase readability. Move mutex locking into sps30_do_meas() and tune it up to use guard()(), as every caller takes the lock anyways. Signed-off-by: Maxwell Doose --- v2: - Switch over some scoped_guard()s to guard(mutex)() per David's suggestion. - Remove redundant whitespace per Andy's suggestion. - Add new wrapper sps30_do_meas() per Andy's suggestion (see commit message). - Add Joshua's RB (link: https://lore.kernel.org/linux-iio/CAKqfh0FWig8mRR-xhvnfcFeSinR6Ry= SyPaf9Gbpb6WU+diiiUQ@mail.gmail.com/T/#t) v3: - Remove sps30_do_meas() wrapper per Andy's suggestion. - Remove Joshua's RB (major changes). v4: - Move mutex locking into sps30_do_meas(). v5: - Tune up commit message to be more specific about sps30_do_meas() locking. - Fix up some stray whitespace. drivers/iio/chemical/sps30.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/iio/chemical/sps30.c b/drivers/iio/chemical/sps30.c index a934bf0298dd..8e15baa31423 100644 --- a/drivers/iio/chemical/sps30.c +++ b/drivers/iio/chemical/sps30.c @@ -5,6 +5,7 @@ * Copyright (c) Tomasz Duszynski */ =20 +#include #include #include #include @@ -69,6 +70,8 @@ static int sps30_do_meas(struct sps30_state *state, s32 *= data, int size) { int i, ret; =20 + guard(mutex)(&state->lock); + if (state->state =3D=3D RESET) { ret =3D state->ops->start_meas(state); if (ret) @@ -111,9 +114,7 @@ static irqreturn_t sps30_trigger_handler(int irq, void = *p) aligned_s64 ts; } scan; =20 - mutex_lock(&state->lock); ret =3D sps30_do_meas(state, scan.data, ARRAY_SIZE(scan.data)); - mutex_unlock(&state->lock); if (ret) goto err; =20 @@ -136,7 +137,6 @@ static int sps30_read_raw(struct iio_dev *indio_dev, case IIO_CHAN_INFO_PROCESSED: switch (chan->type) { case IIO_MASSCONCENTRATION: - mutex_lock(&state->lock); /* read up to the number of bytes actually needed */ switch (chan->channel2) { case IIO_MOD_PM1: @@ -152,7 +152,6 @@ static int sps30_read_raw(struct iio_dev *indio_dev, ret =3D sps30_do_meas(state, data, 4); break; } - mutex_unlock(&state->lock); if (ret) return ret; =20 @@ -197,9 +196,9 @@ static ssize_t start_cleaning_store(struct device *dev, if (kstrtoint(buf, 0, &val) || val !=3D 1) return -EINVAL; =20 - mutex_lock(&state->lock); + guard(mutex)(&state->lock); + ret =3D state->ops->clean_fan(state); - mutex_unlock(&state->lock); if (ret) return ret; =20 @@ -215,9 +214,9 @@ static ssize_t cleaning_period_show(struct device *dev, __be32 val; int ret; =20 - mutex_lock(&state->lock); + guard(mutex)(&state->lock); + ret =3D state->ops->read_cleaning_period(state, &val); - mutex_unlock(&state->lock); if (ret) return ret; =20 @@ -238,12 +237,11 @@ static ssize_t cleaning_period_store(struct device *d= ev, struct device_attribute (val > SPS30_AUTO_CLEANING_PERIOD_MAX)) return -EINVAL; =20 - mutex_lock(&state->lock); + guard(mutex)(&state->lock); + ret =3D state->ops->write_cleaning_period(state, cpu_to_be32(val)); - if (ret) { - mutex_unlock(&state->lock); + if (ret) return ret; - } =20 msleep(20); =20 @@ -256,8 +254,6 @@ static ssize_t cleaning_period_store(struct device *dev= , struct device_attribute dev_warn(dev, "period changed but reads will return the old value\n"); =20 - mutex_unlock(&state->lock); - return len; } =20 --=20 2.54.0