From nobody Mon May 25 01:14:40 2026 Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (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 66F4C3E5A2F for ; Tue, 19 May 2026 21:26:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779225966; cv=none; b=SKQjbiGkBBAG9fpdjjpBXCrIqvBO+jJtHgHdsSU9lJYLebmFhayAqvAcIFm1BM/1OkXYqxsFRth6uGM5FQF9M4uzM1Dt3KS79m2kp+fjeubVTzSgmMNJGlKxuoF+aAdQ2ylQSO9tbPxsb/SuGwcSU97KJl+OzB6kjPG+UqliFyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779225966; c=relaxed/simple; bh=Q6Kpw7qYanWlv6raDyDWu1oLUku62fOxzuJhGCZ1q7A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=H37Ce774fDx3XdFZ6ydHhmhjJFAR2YhHsZW55IHLCIZ01ksGOfaJenoPPdq/RitZisVJPOC+qTP54HB6F71vgO5QvBZh0Gl1i3FyJxpgAitl2z1l3CEXH7/sDcWaSBgb9eL7AyyR4TPjAYUS62nq8hvPIytRbiUE/ihz41iqfSg= 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=g3qZZlQN; arc=none smtp.client-ip=209.85.210.46 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="g3qZZlQN" Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-7de4be15125so4010693a34.0 for ; Tue, 19 May 2026 14:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779225964; x=1779830764; 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=B0KyhkGaS/nUapgZFdjRlHgIG4C/dkih9MtGyG/usJY=; b=g3qZZlQNKF6mrtSMZzXAtU3s2UWfpZQTbCbl0f0I3WLCgXgeMIont9nk2+TlWdLdoc S3hecVNIaLzIyPtdiG7+FlRWYGRN3ee+EgXuCkAQAVlvJYAF9BwsljQkH/wa+gSWmn/y cowdzx3695EIAsxeB13IvOJ0n45zY8CqjH792sDUvL2PW+HjdXyDdWnpApqdyanbdmBW yUSPQ8jL52EoXFlw6+2/dECh3msFH86hXR1eWTDIM/cY05XGo1yc/7Raj8FyCEJm+SUD 6fLimfDrXN2V+TCUEiP7Cm532YMAprd/wZZ34ZZ9eMl/giJKbsSQ5DZ5vVtCSADll/4z hgUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779225964; x=1779830764; 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=B0KyhkGaS/nUapgZFdjRlHgIG4C/dkih9MtGyG/usJY=; b=rRYpOUpJno8FbHdW7cmNDmABa/qr96dM6zlRFoKblh144t3gRLuFwuk7Ifa2Qvw7uq Ec7cGAZmX4bByDah1GhwuYLSR/zEh9fFq0LqrzC+Havh1BqrR+Q7gP6ozIG/o3YR0oiT LOT4yl4Ye0YaJBtndlEGTE0SyPCHjLs8Hf2F6GD+MnGpleMBtscIWNYw03/ZTjmXIIbE SKQwS4SD8lOXiNN09Lnl5rum0ORsya+WKaQbYISUPhXd6OEqBnaWhAUOQQTciQH5bO0n yBTz9+yWC3mkC4ERIb4MC8DEP6qp2jvca4OPS5CXI7iobVcgm62l6xvIMCpw1z07QpAV 1sKw== X-Forwarded-Encrypted: i=1; AFNElJ+EvkriYLLLIxd37eHhajyIwtbj10pMQDyPzZod9TUl2toUkQ88BYcC+nxkI7YSAz7jMApJN1LGQDbTomo=@vger.kernel.org X-Gm-Message-State: AOJu0YyU72IvNM46aeEB7JdplPcaElhfBQBcDjWEa4kdyZNkAJX9ULVy kGbBXkf+6HV5/HsNMIHLuNJBYl98tygRv0EF8tf8WCSZ/j5Resi7BVDJ X-Gm-Gg: Acq92OElw/ybCcbtKoz/+B7tK0NRXBUBf3JOElcbRBGms7fkwy5iyyaFvXuiCL9A2nD v1+/P6kdP0SUCyLWbXvs5TgVUR8vFvaCU4eQSV2mNO2d8DIMggjSIbgfC9nAs3xAbqO9xV1lx0i qfZJ9401bGRETPC4eXmRHqguAjOkTE8KNGm5XwLJrQQha7tS8E5osaOtCkrQCUjcEZt2JAP6Dm7 rFR+vGQjLuWdF6Se5glIEwLNF4Hjm3MCt2OJ6j80VI7PzGVeWmRKcusG/rAEmV7Y2MjhRqPWivv /aB7kg9GuBnCwJaActqYM2NqFU+XhjWq6H6WnKaluISqKEiz+GkwwTf/k0Q85LQbckdrDhG1MYu LRfJdYuU2V44kKmj6Sp524hsjQIJgpaTRKnfMa+kX0eLd+X7r6eMqJNswTqRawjXG90DohGJRDU oequK2iyDlOEh0d1aQ8JV/QlVFW+bB/Yc3W25MTC9r1f3wtfwJDv9tGitejQ== X-Received: by 2002:a05:6820:1513:b0:67b:baae:3339 with SMTP id 006d021491bc7-69c94583a5fmr14064058eaf.45.1779225964100; Tue, 19 May 2026 14:26:04 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-69d045e6646sm8012606eaf.1.2026.05.19.14.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 14:26:03 -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 v4] iio: chemical: sps30: Replace manual locking with RAII locking Date: Tue, 19 May 2026 16:26:02 -0500 Message-ID: <20260519212602.30541-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" 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. Add guard(mutex)() into sps30_do_meas() as every caller locks it's call. Signed-off-by: Maxwell Doose --- drivers/iio/chemical/sps30.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/iio/chemical/sps30.c b/drivers/iio/chemical/sps30.c index a934bf0298dd..c10026509e9c 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 @@ -160,6 +159,7 @@ static int sps30_read_raw(struct iio_dev *indio_dev, *val2 =3D (data[chan->address] % 100) * 10000; =20 return IIO_VAL_INT_PLUS_MICRO; + default: return -EINVAL; } @@ -197,9 +197,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 +215,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 +238,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 +255,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