From nobody Thu Apr 9 14:58:05 2026 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 84B9E34DB48 for ; Sat, 7 Mar 2026 11:49:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772884182; cv=none; b=j4We3piQgZhs8iCb1X8QmvZbdAclcDiZtmxPwkEFEd1jZdFQP7dojYJUqAKeYXM1oEQusR9kh2kIIIz4hQwrST12CHjy7RzZyTu6i90I2FU/88ijorC3hS1FbEMrvcp4otJfO13O+7QY6BaMJx0GlhsY3ARbLA7Q1zq5L50otVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772884182; c=relaxed/simple; bh=6egIfbb91MwMvx9Dl6WFYBZFdRtaQ2U7JT3bwOxKCwM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=el0DrnFuJkWUUyVLiJGP/9FPlC841dF5JoAf9SrkvrYqte4094mSLeO18qnoTYuN6Rv/nAStVt38Mdvqe2/w4wg6eMbPEYVAb4WxQ6kbnpHNgHtUWFi8bO5Sf2dXXGcJSX4FdJ9S5q3iICPBjkk7+suOxssJqBwXtRiSMiS49X0= 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=L4j58H27; arc=none smtp.client-ip=209.85.215.182 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="L4j58H27" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-c7393536e53so1041836a12.2 for ; Sat, 07 Mar 2026 03:49:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772884181; x=1773488981; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GtfaivtV8h8Ixik8/FgW2zl+MoXFXqxu6ojz9mj7aT4=; b=L4j58H27IySRM89V1SE+ztqI18CxCcsie+Ft82PnWyJlXZtB0KlTmtwCWUJh4JNQAH bgH4tm9f6Ld7JUA2hZeVpgx92kGmw7tIRzUEe393AITNZ0FyylqK1OUx3t/yPU5Dlwoz kBCdsSOG43TO9e/JeL0H5bRnUjr0yWGTbdteKCQFEo4bZ2yXhP1XUFdbyq1NVuGaeUU3 I63lC0b//tdgjW+5/kKim09KQprK1N9iwMc6MSzFBGFfQDL3TTGNYd8uG58VLhGSzobs GOir8UEjraGUDwb/KF9UI+qQia4ky6i5TuALG7hpAp3vGaYTD8UELZ6T4gXOyZPebp3U m+YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772884181; x=1773488981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GtfaivtV8h8Ixik8/FgW2zl+MoXFXqxu6ojz9mj7aT4=; b=uOUk7Idr8hfNsnYezH8HGcj0+Gy0Ibz6w3jGo7m9mIdvDsmcgHU9VDja9viZZKr6wm 7O5rM2JMJ1qXL9Brv3G92KLV2lY/LEXRh/k4lrGDwUMrI39w1I/l0tf89fEHlPUYYGQS R+I9p3qSJgYYq+ypG1+qbA3kQmMd0jd/jgSQhdFr9G8PcB/KwxGjvNHB12M0N1kKh0Ms 2M+EvLuUGZPOYSGZzoIJi8aA957e7nnQ3WPHIvKpCZEKXz2kciBRIPyDVBZuGa9ytcH2 lO9asG73y8OC5M8vwcnXrVSY5I69xztTOKJtv+8eFGSKHMbr+KBl6RPMPSFwrsYZhqUD U/Bw== X-Forwarded-Encrypted: i=1; AJvYcCVFZR3OWSsLWeLT6tslLbvPhH0dz33aFG1Iajg5eq6Qxg3fs6RlGCY7bKOW4Sd8AzCJK1XFTHNfh+DjsH8=@vger.kernel.org X-Gm-Message-State: AOJu0YyM/lFl8fR+KPXi1ttlMCCanem+CS0mo7g7yvWaJ049cTBypFlX UN5/1GRTbyrG/9tednZcRKbzQ+nPcnHcsgyvnsDuYWW+3IxL+gGHe8M9 X-Gm-Gg: ATEYQzxC4qxD+oCFMDYCj+z+nBJXpBGJOIttmPCtBfqHNqx5KCLgPbsjSMZSvGqH+Mx x9sbt8SudKg2eV1T2THOg7/wnPr1iy/b+PokhJoNuDTT/0L9gdDuiY91OBjAA6ioKy4y078/kq7 fcVPm4CtUbtnzzYV4m6iWLXv4lvpoYqHwNx4GWXyO+ylV8KOEiepfPhm1R8zFemvmr6xxYakjL0 FvtQIKExaw/ZM7X1ovGor2Moct3w7YKGAl5P2M98dUeGcwH77pPLviBuOAbSBMi1RH4lYbelApy qKz2Mzn5gTka9GOg5u0RFw5tu9k1BtysZ79vfxliE7kgp0ceXWvA85e6BqJ0brTmXcpOeQ196H8 O4+nxJAYfFXA1jC8syHoEoXi+fi+vKFJyIFZV/Yx+UJr6qNAh65T2OrhjCZFCSYNW1LqYIE6gga wNudeiTmwxKtieh/MEzMe7ZOPsJW/xGFLoAsbedO66+Tg9KLletxMCmctmYantONz0luYedPp26 djw2PCFjefcA5FqSO5Lh0rr X-Received: by 2002:a05:6a21:7a8c:b0:395:1511:7221 with SMTP id adf61e73a8af0-398590b3e55mr5239473637.59.1772884180704; Sat, 07 Mar 2026 03:49:40 -0800 (PST) Received: from fedora ([103.215.156.48]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c739dfbf4fesm4264696a12.0.2026.03.07.03.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 03:49:40 -0800 (PST) From: Rajveer Chaudhari To: lucas.p.stankus@gmail.com, lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, nuno.sa@analog.com, andy@kernel.org, puranjay@kernel.org, dlechner@baylibre.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Rajveer Chaudhari Subject: [PATCH v4 1/2] iio: accel: adxl313: convert to guard(mutex) Date: Sat, 7 Mar 2026 17:19:11 +0530 Message-ID: <20260307114912.58062-2-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260307114912.58062-1-rajveer.chaudhari.linux@gmail.com> References: <20260307114912.58062-1-rajveer.chaudhari.linux@gmail.com> 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/mutex_unlock pair with guard(mutex) in adxl313_read_axis(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Signed-off-by: Rajveer Chaudhari --- v4: Keep ret declaration at top of function. v3: Return directly from regmap_bulk_read error path. v2: Split into separate patch per driver. --- drivers/iio/accel/adxl313_core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/iio/accel/adxl313_core.c b/drivers/iio/accel/adxl313_c= ore.c index 9f5d4d2cb325..084037c89ad3 100644 --- a/drivers/iio/accel/adxl313_core.c +++ b/drivers/iio/accel/adxl313_core.c @@ -8,6 +8,7 @@ */ =20 #include +#include #include #include #include @@ -356,19 +357,15 @@ static int adxl313_read_axis(struct adxl313_data *dat= a, { int ret; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 ret =3D regmap_bulk_read(data->regmap, ADXL313_REG_DATA_AXIS(chan->address), &data->transf_buf, sizeof(data->transf_buf)); if (ret) - goto unlock_ret; - - ret =3D le16_to_cpu(data->transf_buf); + return ret; =20 -unlock_ret: - mutex_unlock(&data->lock); - return ret; + return le16_to_cpu(data->transf_buf); } =20 static int adxl313_read_freq_avail(struct iio_dev *indio_dev, --=20 2.53.0 From nobody Thu Apr 9 14:58:05 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 53FCF34DB48 for ; Sat, 7 Mar 2026 11:49:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772884195; cv=none; b=OK40h7Ui5UqJa52XhsBM2YwJK4XZSSdUMKPnCic8JBhRIO29k5jLJwvHDc0RIH+olg/C2uSSdRPjd6VzuRqo+i3rEqWGlT+tCbHy33At5Pd8JhgwUxtc/gyFqwSlHobViodo7BEPOL7UVQVBPTqRKwzoqKwLTGlWEjjDBCOXNJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772884195; c=relaxed/simple; bh=Y6VH0Y0ioHfBudJ9lmPqZlTyuIHbsv08K7tlKnXbmUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WlfIE3CATASTwbm67wObnUUzUXv+gG3yVosVSk9kmZR7u9GnwwDwkViXwat1IXBQFqZnjhtXVzhrTWWVEcuktDPpa5b6JBYd+dnV6gcUqVTDxoyrKDpqqNXSOiuNYY2ATMZDwmxVnU3TX2ZjOPcxPft0fRrZQ60+0KpPviYEqyA= 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=Jk/4lRdy; arc=none smtp.client-ip=209.85.210.170 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="Jk/4lRdy" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-82995242934so922029b3a.0 for ; Sat, 07 Mar 2026 03:49:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772884194; x=1773488994; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QMYrkrREFEqpYEwdcfjCkDC0fr9w3B26gaPmUI1pG/Y=; b=Jk/4lRdyTTuWv9YTp9+Fh5+SjLPIwvs5PljHE2A1X/DuubAs7HcUy/HKLStZCBNpit fDrUWjkaacwh8k6UA4qRCcqKQM3KiFeX+c6m976hCrX3zUMTSoRH7vS/CCYjC03FnKP3 gZGG2rNWLGV6w+u/JLqI1bkEyZ+jXN9iVTCE6BrlBT/PSSsIJXLlDeiCxA4+WyU6jiGR cau+MFxc2xBemGkKbC7voB3JYTkJB/zQaipoKpqJ5nelZmWOMkxEarhx6hZv1DY6OL2M 9fra6eT9ZgbJRzOfM+3yx6e6H8ZYrohyS+l4cTqfTwGZZ88NAReXLICm3Ecw6+y8Z3d+ w5CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772884194; x=1773488994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QMYrkrREFEqpYEwdcfjCkDC0fr9w3B26gaPmUI1pG/Y=; b=MpKFsGY3p9mWPHOYiAbqcECM1WkgwELVA1/PV6YlzjXa9hAGnbvdvSaBTUwpQRRt7P AzxEWDaA3Cqi2+G0vOAKi85a+SPpU1OCizD0/mjrbyCVQa/mE16nEb4Yb8x+N0SvJJ+G 2MBAP7ZFAN9DtrVWIaZp8pEz4uf5J8jsbEn/EQCqY2FuzspvO6h4k1/FO9XRyFWhobL5 3dmEwsxyQzqOcQE248cmF4j7pQiswl5St+OniqDiKgs/ta8BWFX8VhQIVWDTTFHk9ZAP vTPgCnB1a8Ur+1Y6iLNijL1gfGTXQEWZwhXYN+EvUtk96VspHK57EcYtWwie4Lk3OkXW DS6A== X-Forwarded-Encrypted: i=1; AJvYcCWqVwqqJso/OjB9UCT25NcNwfgQ4NUQCCtCrmQUxB5MxAiLl4NjRIQ+3bQes0RuX44uRrwI4aa20ej/iMo=@vger.kernel.org X-Gm-Message-State: AOJu0Yzz/8zV00hkq4T7p2sCA4kc+bcJEkuGyRWYuMeck8NOmKm9p0RB DMPDi67OPrwPt6U63Ku0MrHaKR5SFfrCkjyAyoB2XBcJAIlpM431rwRM X-Gm-Gg: ATEYQzxfVb4AS6FpUQf3jusNUU35axbJ4Jz6O8z/CJelJL83JdCpsbXxq3k+qGYdH64 Qg09bvZNniMhnKT8RW24NnCa6poEYnlAHskb6Lg0/G/Vs7kMnbns8C/h1W1CHpVxyVi8b1f/2Kj UtdE1GE+/ttjAYbFQu6GmJzklNvVNtaT6RqX8te5P16DWjkRsO7XF09gBf/2m91MZjRKwY0TbH+ ZrFXtuqr9eyLPEW15vKM8Z32xuW6Fk+T02kFH9J3Rkz0o0dEx6o7IGpOU7gRGKHOKLf9z2gPyXd LYM+izLVyjJoUQ93ZYkcwX6EWKoU7OERkvt3snsGf4fYv9iOmt900S2iiMZAVStAFoOEUDjeMlf j99qBr8MeZYjHsbgxWwtAPfKmpRN1oo7/DRqEPRcWUoxIOH3TiQCC+17H1C05DDKmwZkuTpKhT4 gPD+A23iofZongSTs3ZMRvJ/4z7xsPwF+UMiJvq4f0uZdIu5LNooqwegrf7XoCP0hI8F8NGI3+i 7vYglVNovh5yWSBxwANMIGRAZiSFpnhu4w= X-Received: by 2002:a05:6a21:d86:b0:366:1917:54cb with SMTP id adf61e73a8af0-3985a64cb52mr4821364637.3.1772884193600; Sat, 07 Mar 2026 03:49:53 -0800 (PST) Received: from fedora ([103.215.156.48]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c739dfbf4fesm4264696a12.0.2026.03.07.03.49.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 03:49:53 -0800 (PST) From: Rajveer Chaudhari To: lucas.p.stankus@gmail.com, lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, nuno.sa@analog.com, andy@kernel.org, puranjay@kernel.org, dlechner@baylibre.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Rajveer Chaudhari Subject: [PATCH v4 2/2] iio: accel: adxl372: convert to guard(mutex) Date: Sat, 7 Mar 2026 17:19:12 +0530 Message-ID: <20260307114912.58062-3-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260307114912.58062-1-rajveer.chaudhari.linux@gmail.com> References: <20260307114912.58062-1-rajveer.chaudhari.linux@gmail.com> 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/mutex_unlock pair with guard(mutex) in adxl372_write_threshold_value(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Signed-off-by: Rajveer Chaudhari --- v4: Changelog moved below --- as requested by Jonathan Cameron. v3: Return directly from error path without goto. v2: Split into separate patch per driver. --- drivers/iio/accel/adxl372.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/iio/accel/adxl372.c b/drivers/iio/accel/adxl372.c index 28a8793a53b6..4bf8656991ea 100644 --- a/drivers/iio/accel/adxl372.c +++ b/drivers/iio/accel/adxl372.c @@ -7,6 +7,7 @@ =20 #include #include +#include #include #include #include @@ -336,18 +337,14 @@ static ssize_t adxl372_write_threshold_value(struct i= io_dev *indio_dev, unsigned struct adxl372_state *st =3D iio_priv(indio_dev); int ret; =20 - mutex_lock(&st->threshold_m); + guard(mutex)(&st->threshold_m); + ret =3D regmap_write(st->regmap, addr, ADXL372_THRESH_VAL_H_SEL(threshold= )); if (ret < 0) - goto unlock; + return ret; =20 - ret =3D regmap_update_bits(st->regmap, addr + 1, GENMASK(7, 5), + return regmap_update_bits(st->regmap, addr + 1, GENMASK(7, 5), ADXL372_THRESH_VAL_L_SEL(threshold) << 5); - -unlock: - mutex_unlock(&st->threshold_m); - - return ret; } =20 static int adxl372_read_axis(struct adxl372_state *st, u8 addr) --=20 2.53.0