From nobody Wed Jun 17 02:49:28 2026 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (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 36A9D42B75E for ; Tue, 28 Apr 2026 12:46:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380412; cv=none; b=bYmTMdi/+WRCwRevQJYmK+Dn+VMIjd8YRvlnDxsvwClq4bCCYyHMj0u7ahC05K9uYLKNverN5v4tQy2Stf+sJabIdU3DCQgxxH6WljhQtD19ANUxozP+8Wxoj/4k6XmFVXfn58+trlZROUFSjcRNreZGBfJgcR+vILa0Spk9ktc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380412; c=relaxed/simple; bh=Szqoqlf6r3PtT3dYd2Gr2nMvHc0AnHZ9jFMZ5ZHEEmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=enqo12FtCrIMbAbO19bf/fY4yLqvJyEc09pWbisTQg2ctERPDp6ndjR1rpLkoJy8zxiZ0FuLkAEow1dcZ8rIDZ7StRv9ZsVk7WfB6zq8owb3cfIVifp4f3gHuojUzELbL14wuHaSUQ/2t7olTeu9BDqmRvCI8WwyF2NtHWKUWZk= 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=VcheByFg; arc=none smtp.client-ip=209.85.210.43 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="VcheByFg" Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-7dcdaf06498so5070901a34.2 for ; Tue, 28 Apr 2026 05:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777380407; x=1777985207; 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=2maPP+Sn0SquGJSG5S39jmmzG5ZaI++3zMHiBnWmo4o=; b=VcheByFg7lT7A32k7J8XN2+EqvsZK/xoUcalTZHYjrUXj03CEmIn6L5cRW3cLKwQWp XQGkaW/2FhzVvpWI6zuwfhCsm+hLhSwfZ5EkNt5ssnnllMkIZxk6vJ7TdHjYA+3GaGPi zig/nEsfw2GOhBSBt8/5/EK1ov/K6cswH5NqotYPmcas5l7Tt/Y2Th4aARgTBSw10My8 QX+Ot0WylMUMyCUqSyPA7dwAEViGSe2GA3Rn16Xc5vj7nVuAXeW9lZonyyQgh7BlUVef Xn6lNjDhPzhUH6ufGzrBNx/UEK3+O/+qnt0po5LnX/ohYh6AFkGvsH7AcnF1DfYDuv7M HzLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777380407; x=1777985207; 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=2maPP+Sn0SquGJSG5S39jmmzG5ZaI++3zMHiBnWmo4o=; b=Qq5kbhgRSgYWY2yMfMU435AnMVWZ2KqfsrvKGEZhJZqW4LDIKp/rJGvNydrvtHUV7w NJ9bOuziehviWDpac8IuYAvtaga1NsCH+5fAoflL3Bs6VFNX0IwjFCdyjCPfZyjNuc3S +gGxtt4Am8PysOBI8rGGQJPAukQXz8wsWCbA3+lkvVnt0oE/mvV+99WTYVW7uHB1Xvnk K3wA0q1R/t1IqXHdLXYXEHQXNediTp6NegWqGcX+43VE1KrgM6uGQiqjPUdOoSv61snj bCTRpvF63PZO6XfWCVA0mHNdwX1wAxKukH1NzVSAa9atoO57V9t5yqIOmk09LPknp6xg n2eA== X-Forwarded-Encrypted: i=1; AFNElJ/ZPsElmpWzkRwtvlID7Sg1Js6IRhuvKdlYsPMljZvrcsmGKvfjBTx6AMeBeyn13dZPUpV88c6RxWXc36A=@vger.kernel.org X-Gm-Message-State: AOJu0YxUFiWgZ8aXOgd18Jk4E3fvfD2eJjjgMh3aFYUlukNX/6HBILpE iumZ/VwGHczyvqzMylX/Tt2CxjoTA9nzi5qdH18LFkWmmduWnic9Q2q6 X-Gm-Gg: AeBDiev4P5LzvbuJ+HBLg8A3GfRikApgdZeg27ajt63L9PwPZtyqJo45CNw/cCV4zkE tUFwNpeUo1Rc3IzIYNgfVBoKy/eRA2CRDQukbpvRT+CgkhI5Jc1uqnnYlL2ZvNBbVX65C/sKm84 hp9t8z7EKf8U9KsOMjjGL4p/U/cvpXHm5F7xwqr+NVYiLKvFP+/Lf5QyqnTE3PEJMBq3g9YiACB PiK+HKfT2uM+OqLZ9H0X7vd0X1gDlmRHk3iac8tzFyIedPHCpvuhK5YUC2WSN/AW82qw6YOUVT2 hTiO/79+QLAWFFD1CcakTZ2GrReeXSc5F7VOfSmABN4+uinUz2jTGKnnAak5Cy1tJFxXR0dxii2 o/Thm5lMZcfw5T5hYGD9wsckXwq1SEQsosle5o2Q23mHOIVjMcMCFz5zcLZZreQR090k/SU6F59 +LKLLUTeD9j7A3Q2ynhj/4P2zFUc9SdHtog9b6tNAxmdDDj6Gi3weZ3YFerWbN5won6QR/ X-Received: by 2002:a05:6830:3142:b0:7d7:5b78:ef31 with SMTP id 46e09a7af769-7de9a00d5dbmr1843887a34.12.1777380407397; Tue, 28 Apr 2026 05:46:47 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7de986a5601sm1683041a34.19.2026.04.28.05.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 05:46:47 -0700 (PDT) From: Maxwell Doose To: songqiang1304521@gmail.com, jic23@kernel.org Cc: dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] iio: magnetometer: rm3100: Use guard(mutex)() in rm3100_read_mag() Date: Tue, 28 Apr 2026 07:46:41 -0500 Message-ID: <20260428124644.49707-2-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428124644.49707-1-m32285159@gmail.com> References: <20260428124644.49707-1-m32285159@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 mutex_lock() and mutex_unlock() calls in rm3100_read_mag() with the more modern guard(mutex)(). This will help modernize the driver and bring it up-to-date with modern available macros/functions. While at it, remove the now unnecessary "unlock_return" goto and directly return in if statements. Signed-off-by: Maxwell Doose --- v2: - Switch out scoped_guard() for guard(mutex)() per Andy. drivers/iio/magnetometer/rm3100-core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index 2b2884425746..426963935d60 100644 --- a/drivers/iio/magnetometer/rm3100-core.c +++ b/drivers/iio/magnetometer/rm3100-core.c @@ -204,27 +204,23 @@ static int rm3100_read_mag(struct rm3100_data *data, = int idx, int *val) u8 buffer[3]; int ret; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); + ret =3D regmap_write(regmap, RM3100_REG_POLL, BIT(4 + idx)); if (ret < 0) - goto unlock_return; + return ret; =20 ret =3D rm3100_wait_measurement(data); if (ret < 0) - goto unlock_return; + return ret; =20 ret =3D regmap_bulk_read(regmap, RM3100_REG_MX2 + 3 * idx, buffer, 3); if (ret < 0) - goto unlock_return; - mutex_unlock(&data->lock); + return ret; =20 *val =3D sign_extend32(get_unaligned_be24(&buffer[0]), 23); =20 return IIO_VAL_INT; - -unlock_return: - mutex_unlock(&data->lock); - return ret; } =20 #define RM3100_CHANNEL(axis, idx) \ --=20 2.53.0 From nobody Wed Jun 17 02:49:28 2026 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.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 DC6BE42E000 for ; Tue, 28 Apr 2026 12:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380414; cv=none; b=KgknajWZ2RKJAZzEm91NsHo6W0gXwDY9NrcN9ADoQZlxa+RL+vJhuZ7Q6R6boXBbK2UvfvrmeO01oSqhQXCR480cARBpLr/Gp2tFGv4Rdrr2tCNMqJHbSuwvRwIZz7zzSRaZ/3R3PPF5hcRtSYkCtHtfm1kSkIi2oJL0OnU/4UE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380414; c=relaxed/simple; bh=UT7NuKLuGgTuNr0/CKw4l6W01tIu5MsYrZD6lyp191Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eWHTsDGNJRhwRFTOB4AHXwQrNPIwCi6Rds9cd5DgyQhuqmjP1h2heu9NvY3jseF9uQ5hkVbC8pHhe291QJeO7zKE9aJJS6c9uT3f1ODDAJPZ3JeoDxSzdl0KhFVXS/Gwa/pn3Xu+EQXTFowbohQ/G29Ejewo0DGEwdK/qc6r+Ys= 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=BYxHQOEM; arc=none smtp.client-ip=209.85.210.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="BYxHQOEM" Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-7de4ed0593fso2875289a34.1 for ; Tue, 28 Apr 2026 05:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777380408; x=1777985208; 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=XTvUm+2cv5BhSMHJjRfViFpgjyg9nQ2nh0Gttr9wDyg=; b=BYxHQOEMEnD9f2zuoGGrUJ2POjCMir6Vnla4pMLI0fsXeN4EBKi8GF/aqZbBIa2hKD u1GrbNiXK5L8QQrjc7lMZzQf0873hsCusNBGWJnWOuazLt4Z4pfRLbj/JH6d0TMlb903 LoS3F9RFcRyqeIG4bQJ1QXvHmtKDjm8/pz2J+Bcwpe9XPQUYMc72FHinLhtlElh2B+Oh OCv3wmSmIj637YC4FrUn8BPwS066HeM7bB92oSypgD9JqwHRA5iFbvWjEeWCQCDWy4ql oR2G4z+nE+MqmaNLAyx1kXPxqsOoAjEkpvkpae20JW/l2KUVRuJsK5R28afEGJqsRdzB k8MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777380408; x=1777985208; 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=XTvUm+2cv5BhSMHJjRfViFpgjyg9nQ2nh0Gttr9wDyg=; b=RftA5we3HHQLdDsHNTDjndnxkKIs+Lu6ny7eMETeBlPjasp0nI9MwYwM8etjWE++7q U4lQbUCjyFyZGKd2pfeknIF9rtAuDAzE+7j1y4k5ZUI0SMEYhSj8amR8hzSKK9QRr7Kg bM4Xv+3nZcgE81WkvKSAcjaPU5m9+ImsbMKCS5c0j5aSqFKJQTejuNrlaOxZnHXT4G/j 6B1evIY+OqPla7+RldjY2FkAwSm2cizOcVw0P4/NiuO1a4EWN6fjrW8lEGgH+IQJrRIR 2jz47HfIFQO64Z4UxQcKLVfLc5YZLerDJwtxMEP7AVwBFIACcx9GDyodWe/Tojap93oh mwgg== X-Forwarded-Encrypted: i=1; AFNElJ+NIdRjkILMX05/9N1hKipulh6JeyXo2e6jp6aE1lrqH3Uf0SGnlSmslPrfKXKgY/TDgEuReSm7B4uqY40=@vger.kernel.org X-Gm-Message-State: AOJu0YwtMkTYXPqnhbwWz6fnUa/+EhkxskVVhM1mvr3/VLTERiyDt0qe +cn4maBdglr0KLPx2jMuWcHKqJA9meOin2PmdL4FpHZd4/pTy01FoICB X-Gm-Gg: AeBDietJcwpuyMi2N+xuZDdU2QHJvup4B2HS2F5k3QJwp2vF9WPTQtSvzNqjZCVqebp mS4anE4jGudQNniCMGpbe7iOSwuGVDLxkQlAp9WpAavbYCYbF7MgzUpm0hzb/ZzwhEmCm3hRTDC 2vHLugcJkouKL1dvSCT5UFy37Ay4XtsZ2klAxXcGReXlJrSGRK/HzvGsAoPjr84PQUSnkl15931 VEiNDnLulNzjA8+ZizSdz4GGCvbxYPkV+0WuIO5qBnJ7MmkABHR9QG4fjmDPp7TJhwgDD7uJKsr 5sXsW4TfV23aGSQS9qCCzOuKQ38tvsHnWyDjAUbpeZ9dW02hCJy2T2F6p9wFsxSBBV3tN8FRh4r PSRs8hMwddR5baO+B4g4Z4JgnzHeafQn5Q80qQkrRg3PtIVMdvN4KyuMuB0oHi8WTbxG/cGeleO jH78gJASSWbabo2/U5L96ntA7GZsc/TwOtvpImeCFL0ydCSj7kN55VSwdIKyySuvftwb+S X-Received: by 2002:a05:6830:378a:b0:7d7:ea9f:c0f9 with SMTP id 46e09a7af769-7de99bfbf76mr1602031a34.0.1777380408371; Tue, 28 Apr 2026 05:46:48 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7de986a5601sm1683041a34.19.2026.04.28.05.46.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 05:46:47 -0700 (PDT) From: Maxwell Doose To: songqiang1304521@gmail.com, jic23@kernel.org Cc: dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] iio: magnetometer: rm3100: Use scoped_guard() in rm3100_get_samp_freq() Date: Tue, 28 Apr 2026 07:46:42 -0500 Message-ID: <20260428124644.49707-3-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428124644.49707-1-m32285159@gmail.com> References: <20260428124644.49707-1-m32285159@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 mutex_lock() and mutex_unlock() calls in rm3100_get_samp_freq() with the more modern scoped_guard(). This will help modernize the driver and bring it up-to-date with modern available macros/functions. Signed-off-by: Maxwell Doose --- v2: - Move if statement into scoped_guard body per Andy. drivers/iio/magnetometer/rm3100-core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index 426963935d60..9f25efb2d02d 100644 --- a/drivers/iio/magnetometer/rm3100-core.c +++ b/drivers/iio/magnetometer/rm3100-core.c @@ -280,11 +280,12 @@ static int rm3100_get_samp_freq(struct rm3100_data *d= ata, int *val, int *val2) unsigned int tmp; int ret; =20 - mutex_lock(&data->lock); - ret =3D regmap_read(data->regmap, RM3100_REG_TMRC, &tmp); - mutex_unlock(&data->lock); - if (ret < 0) - return ret; + scoped_guard(mutex, &data->lock) { + ret =3D regmap_read(data->regmap, RM3100_REG_TMRC, &tmp); + + if (ret < 0) + return ret; + } *val =3D rm3100_samp_rates[tmp - RM3100_TMRC_OFFSET][0]; *val2 =3D rm3100_samp_rates[tmp - RM3100_TMRC_OFFSET][1]; =20 --=20 2.53.0 From nobody Wed Jun 17 02:49:28 2026 Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (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 408AA425CFC for ; Tue, 28 Apr 2026 12:46:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380416; cv=none; b=ey9db7MHzslnltzQyhQi7HvPESwIrJ6zfgIz3k8XE2sXTedZyZ3NZp+dh3QQHfYG1wrzaM9qnroJ9T85mAJZYldCZV/YYbCXbiPEBikTDFd9YCsJR950NQcXwj+0Os3uxWD7VDv+USkxWZftObYYqqcO5bG/5cuasMNtbcb5ffU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380416; c=relaxed/simple; bh=EyyOQuWL6/GefVd19dOAwzBViaoRhCHSwxojmabHjZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=izowagm7uIMnpTGlC1MYxW9+GlpXirLirTZCkMXUi+bOU2oUsteeKtAXfnK6bkApIhiLtRxSQMv8vQUMFGdfl6PQyIPgswOa3moXFu0nla7qwGzH2AuWfBiyNY2N1gE1HJ0pO+p1qet4mShM7Cjc9xxDnVHcU48hmyW8iKxIB+g= 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=TJWoqtlm; arc=none smtp.client-ip=209.85.210.42 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="TJWoqtlm" Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-7d55b97f358so7468116a34.3 for ; Tue, 28 Apr 2026 05:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777380409; x=1777985209; 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=lDMsfTF1mWpHEAoyQjrrWliccNJ00PHaO0ADCiBzBGY=; b=TJWoqtlmyl+HBC+78frwihExPUXMdrqLStbu+XIkyqp1ji15KQ53Wymw6Jh6HsLIoj RTBPSrO7xCz3jDkqRSa71zo/BoMWAWdXZvfp2nRyOfLCI4MYxi6u4qj8UHNMGKJ56cPu 2hpGotKRBFYatdpLJ95bGOCUK55U1U7fYItSiTbZSQlE/oiruETej/hshI4ysHkxQog3 nZ4WbY2PQwgKbWpgOnMNQUazaWcIOg8q4ngsob4lXY/sTObgfgMnssas0ky2wjQyhd22 F4NU+sCygWwBrrKFHUYAuuFBcQtQXyZa7H8a+j0RE0leBAW9s1AnWFSjBdIsONgr8ld0 tUMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777380409; x=1777985209; 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=lDMsfTF1mWpHEAoyQjrrWliccNJ00PHaO0ADCiBzBGY=; b=iyYa03Lk/ZESxlIGZiIVujxP3XN+29MGCRCDiYaMU1Z1VYfM0Iw69UNTDt7qAkAG1Q 3P9Gu5X+JuoKxmKeXqc9pya/By5Poy+Iy3YiycIbXaTV/h8/idGAEyH3scoCKs7YGt2j I0JdBoyRWJSKCOQQVlgec5oAPjpOMJcQg2WgWnofwpwSb5corDHk3r6RP24Rvlcx3fHY fiRXeJ7et+0a1MD63P+mG0a3jyIWNWL514Vm6jGy9ay47cxUF+2rbWn5MgabNsGbB0IM 2UL+40qOQty0pnsFzgPA27IaHnYj6glk770BCneiZ5XeNPOvuvnyp2C/tl+Y/opcmP6t GLnA== X-Forwarded-Encrypted: i=1; AFNElJ8ernV25t//ex+Q440GxeoirCjnyPIfnFmq39m9l4ZobGc0jMKYXc4+hatb+CTr5DfenOp4W3ChB03cupg=@vger.kernel.org X-Gm-Message-State: AOJu0YxU1V/MPjBDnfsEXyO5ckyA5I2kCayaLxoCRZB8qN5/qITfKmXH fWqnkgtDpCqA1D3d1vQaUcT4UpNaSt3WrZpJmOHmPKBZMipfQmJ6PyWB X-Gm-Gg: AeBDietq3JZiTjMf6oDnAZUhnh1xYfaUrLaHYhCMofME9stMRInrdKCQV9NBihv28IR ZVpJwhWV/elj4n5sN9tTqIYa0ZwWu405mVp1vtooZu0pctjYBwF7iMLYVTMez2q+4J+JK8BBZko NnMHrCMQQtiJwadfQHc5l9A6jBWhNmT1tvuDZUQUC2X0SnwO4v6QbMGnQN0EXUYaYVsJ/L6g9uS Rxo5XHQjgTW3Fuc5MaC7gmHzjHUao0PTXIgLhR0Tydykq8zP1AKTw8eW6X8lTXzrGlvIKrtAxSw FG+9NY35FXgoBQmQo33JOgEhl1HfEviWUYLRX9DqRwrOoeJEHhF6ZGNN9yafTHpqRmchhGxCoY2 JTesz/JhN46e6y4yLCoX5ztmxAjAkarxOyJShvJqZ5bcSUrdGpNpolPFTdiJnhEbokDLAOJOpE+ Gl7wu968Pc6HnNGxNB1ea0U9lHaFU5FlLMv+EzSLoo9GbKoSYHLSf+yPxzziTfAdOHR5ce X-Received: by 2002:a05:6830:6d05:b0:7dd:e032:3cdd with SMTP id 46e09a7af769-7de9a0b6146mr1653737a34.18.1777380409478; Tue, 28 Apr 2026 05:46:49 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7de986a5601sm1683041a34.19.2026.04.28.05.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 05:46:49 -0700 (PDT) From: Maxwell Doose To: songqiang1304521@gmail.com, jic23@kernel.org Cc: dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] iio: magnetometer: rm3100: Use guard(mutex)() in rm3100_set_samp_freq() Date: Tue, 28 Apr 2026 07:46:43 -0500 Message-ID: <20260428124644.49707-4-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428124644.49707-1-m32285159@gmail.com> References: <20260428124644.49707-1-m32285159@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 mutex_lock() and mutex_unlock() calls in rm3100_set_samp_freq with the more modern guard(mutex)(). This will help modernize the driver and bring it up-to-date with modern available macros/functions. While at it, remove unlock_return goto and use direct returns instead. Signed-off-by: Maxwell Doose --- v2: - Added blank line below guard(mutex)() per Andy. drivers/iio/magnetometer/rm3100-core.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index 9f25efb2d02d..eb59ea8d5bf5 100644 --- a/drivers/iio/magnetometer/rm3100-core.c +++ b/drivers/iio/magnetometer/rm3100-core.c @@ -335,56 +335,50 @@ static int rm3100_set_samp_freq(struct iio_dev *indio= _dev, int val, int val2) int ret; int i; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); + /* All cycle count registers use the same value. */ ret =3D regmap_read(regmap, RM3100_REG_CC_X, &cycle_count); if (ret < 0) - goto unlock_return; + return ret; =20 for (i =3D 0; i < RM3100_SAMP_NUM; i++) { if (val =3D=3D rm3100_samp_rates[i][0] && val2 =3D=3D rm3100_samp_rates[i][1]) break; } - if (i =3D=3D RM3100_SAMP_NUM) { - ret =3D -EINVAL; - goto unlock_return; - } + if (i =3D=3D RM3100_SAMP_NUM) + return -EINVAL; =20 ret =3D regmap_write(regmap, RM3100_REG_TMRC, i + RM3100_TMRC_OFFSET); if (ret < 0) - goto unlock_return; + return ret; =20 /* Checking if cycle count registers need changing. */ if (val =3D=3D 600 && cycle_count =3D=3D 200) { ret =3D rm3100_set_cycle_count(data, 100); if (ret < 0) - goto unlock_return; + return ret; } else if (val !=3D 600 && cycle_count =3D=3D 100) { ret =3D rm3100_set_cycle_count(data, 200); if (ret < 0) - goto unlock_return; + return ret; } =20 if (iio_buffer_enabled(indio_dev)) { /* Writing TMRC registers requires CMM reset. */ ret =3D regmap_write(regmap, RM3100_REG_CMM, 0); if (ret < 0) - goto unlock_return; + return ret; ret =3D regmap_write(data->regmap, RM3100_REG_CMM, (*indio_dev->active_scan_mask & 0x7) << RM3100_CMM_AXIS_SHIFT | RM3100_CMM_START); if (ret < 0) - goto unlock_return; + return ret; } - mutex_unlock(&data->lock); =20 data->conversion_time =3D rm3100_samp_rates[i][2] * 2; return 0; - -unlock_return: - mutex_unlock(&data->lock); - return ret; } =20 static int rm3100_read_raw(struct iio_dev *indio_dev, --=20 2.53.0 From nobody Wed Jun 17 02:49:28 2026 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 4344A438FFA for ; Tue, 28 Apr 2026 12:46:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380416; cv=none; b=Be1O2M5HV78LwmgmcnSYsnxeHcz1Pw40/yFmgZouNxtBHxk00Qcw2JjgBzkJdy4ZB3/EslE4V2+OMVlvteoK42j/bJtIzKBX32r6tIkgDkIughi0oxjT7OBC/OVsoo9sYfJOcF+VwMcsp+8MoWpIsTd59XDX0o7GGgyPRd1GATw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777380416; c=relaxed/simple; bh=UeT8LyJ6LIXE+IjlooYgXtnFImoXnwlxSoofLNVryqo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FsYPc7cZJwmIjS+m81t2BtvEx2CACGViUWS8narQ9UoGA7B1TT4lYU5CQuvIqsb50+iNlbxy+asbgUHgqlCTkSO2ziZCNk4lNalPzjc26S5BS47GoDo5U81Nj1PZ5F6vtdhbpFobcUOBrrcLYOVJIsUmUHKK02iWXlbq5kAtJb8= 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=j/U/AE52; arc=none smtp.client-ip=209.85.210.52 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="j/U/AE52" Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-7dbec19732eso9659937a34.3 for ; Tue, 28 Apr 2026 05:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777380411; x=1777985211; 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=fR850Eqwaqzi0InII1XrHEy0DbB20DDlrrvurFcFr28=; b=j/U/AE52XO98y+cmPRsZ43Gaxt9pVAfb2wHLwhv2XjaWcC++drzi5lb1NVcdcjLQov YYWdRVg/jm7q5l4rw0OOxTFjhfOn2zOq6QOTWHexf2N27mtSJhTt7jkiK8kowVWA7PJj tky9UOtCYyIQBQRapgx4o1v2bg5ieEbytK0Lq/+oDpkrN76u6SaDUPhjbTfuAaPjIyp5 hb6gRN0gbrIEQ7wyaRH7dAxDS9rgXbnnVS7qC9eBWT4HcwV1APXdVjOSQlNwR7GSP9iE KcqEGCcqTKTyqcdJgrSnmQiwYJuJvtUdNMVAkySXukzKp1scXQK7HP9WQzMBdtW+O/gD hzEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777380411; x=1777985211; 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=fR850Eqwaqzi0InII1XrHEy0DbB20DDlrrvurFcFr28=; b=Qo8nn3WWxwVPGRNgCUznNFnFGh2KhFqUmSUnTpyKil4YFiu1BXHzwUko2trVIj2F8E aKwk9cNvLGMgmFXDxcRIzUjSgFwbjTAw4FEZjF0BTqpHf2+4cWSmkV1OFka4RQQ80J5g 77zrejLS9zgYiTRhVEtIIM7QA4aek/1iWM0tzPtFfiXQf9zbEydKxiGWPEqeeOvyPTzf ko7I7VkkciRNMPC+fLI48CPiBlP7mYmr0W7zy32Tu9K7gESm0/Z0LrghBUHh67hgx/gl z7/r5rjiBsfsx4REJKI9y0Bipx4SVr+RjDpD4vflpuuRZFOKjY7npJPDrS6yxBXlOBH6 mUfQ== X-Forwarded-Encrypted: i=1; AFNElJ+uPkqHqv2A/A58ZMxL81JUvrlggxkWazBAh8lBa+K12iIUPtBlnIH5lSTeiouPXPnw+zTOhnEJTU/a1yk=@vger.kernel.org X-Gm-Message-State: AOJu0YxifqOdbh4ePRzyDxjZgnAbhZJNY5eWiZD2/PIjXigs87wQZij9 h8j+jcnaZ2ENz7QTuQvi6P6xnA23HkH0FxXOlFcORKCDJX847mFIJlpd X-Gm-Gg: AeBDietDsmPrW3mMWlLlV4vwnscIS9EVTTpYTu86eX/tQZX79iAI4WeQzFNdj9yq1wm 207LJ3aypzIk3bXUvFLmXSnu8+4roUY6ieeCFMgd9fauWnofpHZqyiSUhd38wFVQMQAYKVTChGW oLuqfo59sqRSuWq8koC89lp7FLquFtC60tAKYTuAPPCU8HVlssZ2KyrRXQeCtxsZHezSyNRC+BA CkVqxcG2Lqs952OIA2/06EWRm3sRm3wGvjAdVoV1F6AWo6fd9U3HqUHNyq4yJs0cArfU7VzskL1 9okQ2PzUNNPYe+Lk4GjlhATEv1GWxmceDPrfkypMMHapIqjDYRrgRqL9vwQeAUTK9z/1+F1G2p4 ftSDScpnfe3d10gYucX9EKmfRtnLOdXvICP6338V+qMJj7RfxwB3QiubsZHeC2bP8LogxcMbo5i 1xKN3yDg+od10Xnd4U1utxwtuubGljw04nfO/dktiCVWjQSwW0SMbQQUKILliX2UYHSP+w X-Received: by 2002:a05:6830:82e5:b0:7d9:7209:4378 with SMTP id 46e09a7af769-7de9a0c6b2cmr1909164a34.17.1777380410784; Tue, 28 Apr 2026 05:46:50 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7de986a5601sm1683041a34.19.2026.04.28.05.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 05:46:49 -0700 (PDT) From: Maxwell Doose To: songqiang1304521@gmail.com, jic23@kernel.org Cc: dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] iio: magnetometer: rm3100: Use guard(mutex)() in rm3100_trigger_handler() Date: Tue, 28 Apr 2026 07:46:44 -0500 Message-ID: <20260428124644.49707-5-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428124644.49707-1-m32285159@gmail.com> References: <20260428124644.49707-1-m32285159@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 mutex_lock() and mutex_unlock() calls in rm3100_trigger_handler() with the more modern guard(mutex)(). This will help modernize the driver and bring it up-to-date with modern available macros/functions. Signed-off-by: Maxwell Doose --- v2: - Switched out scoped_guard() for guard(mutex)(). - Because of the replacement of scoped_guard(), fixed an error due to gotos bypassing __attribute__((cleanup)). drivers/iio/magnetometer/rm3100-core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index eb59ea8d5bf5..fdee82c1290f 100644 --- a/drivers/iio/magnetometer/rm3100-core.c +++ b/drivers/iio/magnetometer/rm3100-core.c @@ -459,11 +459,11 @@ static irqreturn_t rm3100_trigger_handler(int irq, vo= id *p) struct regmap *regmap =3D data->regmap; int ret, i, bit; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); + switch (scan_mask) { case BIT(0) | BIT(1) | BIT(2): ret =3D regmap_bulk_read(regmap, RM3100_REG_MX2, data->buffer, 9); - mutex_unlock(&data->lock); if (ret < 0) goto done; /* Convert XXXYYYZZZxxx to XXXxYYYxZZZx. x for paddings. */ @@ -472,21 +472,18 @@ static irqreturn_t rm3100_trigger_handler(int irq, vo= id *p) break; case BIT(0) | BIT(1): ret =3D regmap_bulk_read(regmap, RM3100_REG_MX2, data->buffer, 6); - mutex_unlock(&data->lock); if (ret < 0) goto done; memmove(data->buffer + 4, data->buffer + 3, 3); break; case BIT(1) | BIT(2): ret =3D regmap_bulk_read(regmap, RM3100_REG_MY2, data->buffer, 6); - mutex_unlock(&data->lock); if (ret < 0) goto done; memmove(data->buffer + 4, data->buffer + 3, 3); break; case BIT(0) | BIT(2): ret =3D regmap_bulk_read(regmap, RM3100_REG_MX2, data->buffer, 9); - mutex_unlock(&data->lock); if (ret < 0) goto done; memmove(data->buffer + 4, data->buffer + 6, 3); @@ -495,12 +492,9 @@ static irqreturn_t rm3100_trigger_handler(int irq, voi= d *p) for_each_set_bit(bit, &scan_mask, mask_len) { ret =3D regmap_bulk_read(regmap, RM3100_REG_MX2 + 3 * bit, data->buffer, 3); - if (ret < 0) { - mutex_unlock(&data->lock); + if (ret < 0) goto done; - } } - mutex_unlock(&data->lock); } /* * Always using the same buffer so that we wouldn't need to set the --=20 2.53.0