From nobody Wed Jun 17 05:10:49 2026 Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) (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 396833939DB for ; Tue, 28 Apr 2026 02:43:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344224; cv=none; b=Fri8jfOzWddOLqBTJ/jju74FVfjcozW6eyPDYeMqQFU79N3AZRvDZZFF4SKhzQAUmvRWIooGtWYCwn1LVBsjdfrH9ivMfg3yJxRoOqgYBTVLR4olwv2TIbQIJqqadmednpToZUEWX8CfwaHMud04ZOWJtw2BkO/pyHnrBwKZXhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344224; c=relaxed/simple; bh=k2e7VzCTUG49XUMvFa0dmZR5x9BYszbrt+Orxcswq2w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SbbU1mSVG3GIXVfwXzsbdlWSu+zK73fyzOTbMX3hO3YNlfeLhcKuS00qD3FC3XKDp5pTjxR1qzeO80c/WSwmc+QBJI+Xv0dPyTYwXyI6W3OJmYMWrjJH/uPkaRHTAyxwkF8cMYNfrxi1McgFteKFhaMZPUsN9lLC+b6GeODyUuA= 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=DpdANL5d; arc=none smtp.client-ip=209.85.160.47 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="DpdANL5d" Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-42fc6923f38so3444922fac.1 for ; Mon, 27 Apr 2026 19:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777344222; x=1777949022; 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=T39vGluBL8JV264VDfxOvwuC8v7UKvv7R3Dcqwtq8fU=; b=DpdANL5dcvM9DzUe19EKsMX2cgVBQeZEdgoAvMpg106r7znLg0wFy/rVNMDMdbjchh EM9OmozNlzT4bLi59cdqyohtK5uCuZiHrp4eA8BkW6X5tBatxl8a2FWj2znFy2MRd1Pw 7aF9wmOQ1CRGr0zs+CJs25TVzVEqhgwbHB3Dfwq+D3gD7JjkSFf+tgvFkbD19nnwYbBY KvtH4rIpPNazrWf8bHnlmfFKcufN1Km8CSMVM8kZFWPPvwkTEio1nHDz4N2xJqtX5k1c 9WB3qVt4EcMPfkhytb4yJMGeqPjEbV7Vd8oSF14T0w7S4R3bYHVFH1DAmY6wvAy6mm/9 /xzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777344222; x=1777949022; 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=T39vGluBL8JV264VDfxOvwuC8v7UKvv7R3Dcqwtq8fU=; b=RVZ4Ha+7R/MzY7VhjZ63HNEuFwSYb9UgVLCBnnCAoTG1STDnVjwMROgHCRWbS//Tv8 6NjuNH7pGWaR2SvSQTvqabwbOlg2sJGSSmijAEcpZvSkpHwmA5M28RW9845n6CD65QG/ Byv4S9NLcjGpispakzFhOrdyr1aKiFtNlZQO6XR+TKXmam9Yw8+XD7gnTGasQgGhu8rn CqTsWGZhNCEIME0tiFhYMOXEudRujd7NOpqM6hmr7lN1XeUlULMvOSqmnXuRd4esfhnu vN+hDFaxVFlgvX7+t4jMNhkHn8YloshA6HFJcmMsU1hQC60huO2hWcQ5cNTQa7Wtfavo z2FQ== X-Forwarded-Encrypted: i=1; AFNElJ9AhbmpIxMQxtRSHH8NzB2LZiM9vCEmnJflL+DT7+dHvOWBKJV0xcZFg0Z8U7KfmoSslJy6XSAWdu4rB7U=@vger.kernel.org X-Gm-Message-State: AOJu0YzUx3KeIUmYak+mzh1TXo2IjSAriNzjcwoF/+bGj/WGCRHaTV3g hR8cs4ygKEYoJNAo4HSEZtdJmUg33jChzA4gTsXrzJEtP0oxeEYmNS0l X-Gm-Gg: AeBDiesgD+Z1BhG7tF0eE8/zSZsYiKd6/KIbaA8oDQZh7DifvHr3s7BaqJ6faza/CpC ycDErtxmjl5F178dbTVdprdnoX48mSVthzEHa5GkAunCX8VmIXsMSZuqHOQakKHWbQ16KMuN81U 46fCf/KK9w4U3aV3itEKEsbigMCT+YecTLY66hFMjxIt/0Zrk0u9RDIm3sxLRHCilS+JiAhsBss X5ohbN5IlXW/S+LObmDdX07zVC7Hy6AzbM3X2Nr6rr+WAbdr2qE7QweW4CVBSeoLqD1WQWrKRMB WVwrxBYz2yfCEC+rLRBc4TJNDunsw0/vPt+hn0Fwl6xLIVdC3WcxrAjjwsRs37XQ6ZCuA7IgPos Iw//nOjxJU57vFn0jqUa8TQW5ZkZzqxCCHV9M3Hbe/+TMPhVF0E0tQN6F1MSPd1mLEHZCIf+W/A kLFN0pvyCkZShW9kbTHdqnuTExsj7IxM/CJDMfSnSzz66+nYx1ADCibbSRZxeshpibR3Xd X-Received: by 2002:a05:6870:1754:b0:423:1cc1:f878 with SMTP id 586e51a60fabf-433f187b172mr665399fac.29.1777344222230; Mon, 27 Apr 2026 19:43:42 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-433efb816e4sm958392fac.1.2026.04.27.19.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 19:43:41 -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 1/4] iio: magnetometer: rm3100: Use scoped_guard() in rm3100_read_mag() Date: Mon, 27 Apr 2026 21:43:36 -0500 Message-ID: <20260428024339.45109-2-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428024339.45109-1-m32285159@gmail.com> References: <20260428024339.45109-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 scoped_guard(). 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 --- drivers/iio/magnetometer/rm3100-core.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index 2b2884425746..a2bf6e504a15 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); - ret =3D regmap_write(regmap, RM3100_REG_POLL, BIT(4 + idx)); - if (ret < 0) - goto unlock_return; + scoped_guard(mutex, &data->lock) { + ret =3D regmap_write(regmap, RM3100_REG_POLL, BIT(4 + idx)); + if (ret < 0) + return ret; =20 - ret =3D rm3100_wait_measurement(data); - if (ret < 0) - goto unlock_return; + ret =3D rm3100_wait_measurement(data); + if (ret < 0) + 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); + ret =3D regmap_bulk_read(regmap, RM3100_REG_MX2 + 3 * idx, buffer, 3); + if (ret < 0) + 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 05:10:49 2026 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (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 CEE21395D8B for ; Tue, 28 Apr 2026 02:43:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344227; cv=none; b=NfK2GuDPnNeFam/BtFnoIPKLdFg3fhkeJtarzfk1ltQM0BVNcHI05k0UWf+6cpJCUYiODgA8buTGZJjf8VG2KfDEGT7NhQ5NftBj494fjMRVdDkdj2rDeCjA/1MjQkproAGeYL65htLI7zM/hZBC7P9uponbYelkpfcV4lekhd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344227; c=relaxed/simple; bh=KaQ+WdAKFfqKTFp/tfCnBRQxmT/SyVndsAgxXfzkNgc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V5ePBvywZroMIjpJO4W+ySnr2JqUfIcy4gaok75iVLkfc8CY5VFCsUgxe3FcX7Lycvm2VkEtQRYqWdwF/rGV0GjQArq4mqjEykdpF+BM4W5HmBxnh5VCUW9dRANCsLueUuAPKGWZ3zFg4OLwH82tvr1UNuD2jpQQtzUudSbKXt4= 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=EB0P1Uwb; arc=none smtp.client-ip=209.85.210.51 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="EB0P1Uwb" Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-7de7dc85b74so1497099a34.2 for ; Mon, 27 Apr 2026 19:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777344224; x=1777949024; 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=73eztNPvUbceIU07UTl+YS2mjJFGWp/EmbZghnQULsc=; b=EB0P1Uwb4nF5qdixE860wiipCHec3QF5NIzZIgZaHxOByj4Rhtkly5hbuJY4fJGlXM ipJkw3lz2oa3we6OTnsUrNlHeTxqclaAK6FynsLNCfv+BHhqfMO5ECgrJyVKO/aYbIWN v81ux0o/hjCosKgCSwEN+2YdihTOy6hoJpzQImIKZy8jDMhlOFQ5t60etsrBjkfEAMPD N11ao5yUndbyIjJ8Tmkh5uVB5IL0r6Vy2sMMPqKd/BeGR3sfSkr6/9TWgMB7Ir4+1/f7 6b4eBj+f5qRKPgbiWpFoYASkv2ZcbYVX38fFz4pcdh01aNVDYw5GqdaMM4WZj/Apl/Bn rGzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777344224; x=1777949024; 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=73eztNPvUbceIU07UTl+YS2mjJFGWp/EmbZghnQULsc=; b=O1NiWwSc7rX4PLYP+nuS2TFYNXqprLdndQQXgHlBmdd6RBlVUWyiOX4AnqRvdeAihA cYmtBBXgP+cyV8uGkaF6HzFprIoKj58GALVJ6wGtAf7NyGrFLdfs/oBajjvL71joJ+fn 0cdDEbrubacLfgHbwHFdaOgNUYMkBGjVlCrYRGfZTjJGy4w5RTGCOMVlamCcyI+O0Tih BWVviWOZdAy/b36dOTpIRAoANtx8cw84fbTgyHJqLX0f4K7KTDHtchMIfX+ncVYeSDpY 1tdkDNTRrEXGJ/oZSf9A1WlGPNYICNhuDp2LVMj1wosenhVgg/Hjf7fhXSGTBIiQcrZk H4Og== X-Forwarded-Encrypted: i=1; AFNElJ9ZETpD8gvDKAGzLrAhaOQTNQA4oGkDdJvWmX4SFqFds7+R7hVKgqT46tnnrZc33tljEIRsYVJQPECCqeA=@vger.kernel.org X-Gm-Message-State: AOJu0Yzwvuwjz8jnRg/o5HOWLzTDd7bAdBG/HKxw0oY6iGigLE6VlknT QFRKf9vb56MKgo/NZFx5NfQmmVVVIq+SqzFalisFfiW2AET7T0KNpwB9 X-Gm-Gg: AeBDiesGQQVHFXgXD5B2SMW/c7znUmvhp2/L77tfMcNNHTQg5MWMz1xwxlgQsZXEhsx bk/gvfbqiNWGkaDZrG0d6eiheY0jwwyKWdTNWb6VZLSSdV2zcU/rUkt6r5SfdTC1+fGwbbxuw/T kNiulylgO5P4ljGFeE5JgigFSR/dzk6NcAhWsuZT0gzka5geK8YIcE/nlpL0R+62Cl1Vw2ahZSZ v5qJMqQ+kXZsXV+07rzce9JBq6giPC2qUovNrd3hMAL4tdJgOCbjdxNxg/NCHGT/R6aNJknBi8q XBWxAYnd7cQf9pppWT1udoTPkJxTgpJ5d84ykswpW08wiT67AtHHgVj1STDHi6cIff0jdHmVXdu 0nwlD3b8wrz6VxMONy1xHeR5nB7HNgDPIJEAk1a+8a30PpBU3T/8FfXHiUSAfgJFq+dylO9gkIt Nnl552o5BZIUVSixiB4bmKZprulFNJhecmo47w0KUvLzzrURvilCVsBH9JrmbpZK2NWChg X-Received: by 2002:a05:6820:605:b0:694:8576:5d7a with SMTP id 006d021491bc7-6965cb42780mr619410eaf.30.1777344223818; Mon, 27 Apr 2026 19:43:43 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-433efb816e4sm958392fac.1.2026.04.27.19.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 19:43:42 -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 2/4] iio: magnetometer: rm3100: Use scoped_guard() in rm3100_get_samp_freq() Date: Mon, 27 Apr 2026 21:43:37 -0500 Message-ID: <20260428024339.45109-3-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428024339.45109-1-m32285159@gmail.com> References: <20260428024339.45109-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 --- drivers/iio/magnetometer/rm3100-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index a2bf6e504a15..76824dcb1b73 100644 --- a/drivers/iio/magnetometer/rm3100-core.c +++ b/drivers/iio/magnetometer/rm3100-core.c @@ -280,9 +280,9 @@ static int rm3100_get_samp_freq(struct rm3100_data *dat= a, 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); + 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]; --=20 2.53.0 From nobody Wed Jun 17 05:10:49 2026 Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.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 B977F397691 for ; Tue, 28 Apr 2026 02:43:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344227; cv=none; b=R3xhxu9bAV6zoU16oED1JpD5VglEmvWHGKUpZyTPmSPzDyrBIP9+Zd1MAB7zuvWnc9WjBZ2R6wOwGuakb0tcokzH5TXJmUWug56zGtCwBek4r9Elh4hz5HRebgMdLw54L0gtAzeT+yGB6k8bAGe3R8O3lfjiRl8jtAAgLv6ZNjs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344227; c=relaxed/simple; bh=TaVFYZLlssNFU084D6ysgvWO8YI3C+aLLGlnjajoOlU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HPfBib9jIxSDN/ZKs/ymA77civnjYW2rNahm0PM5ttUbKLjzLwXfkRJcyEHFk7bvwnvd9g2HhzvSC+6fnJ60CD2PSMODsM44xWSgT5tdIFC3swCAIf/qb4PBHukimN7RR4+ibqtUoOODScdvMDQ2qr6J8vfklG4ZrNpktDe3A8I= 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=I7dl7rn5; arc=none smtp.client-ip=209.85.160.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="I7dl7rn5" Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-42321c8b8f5so8675886fac.1 for ; Mon, 27 Apr 2026 19:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777344225; x=1777949025; 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=8gPkdpcG/AXzV2r8EJiMuqB5F6EPNovyteOK2fWIr2E=; b=I7dl7rn5IulQ8PgqkaXUTQIIQM9+M0C/AZ5WRALn8xw+4SXmhk94U3CXFyg07WMPbr e3JNppGBrzVdaulq/Y3bw2CaEI6t9IlkhShXz2br2iI8QsEXSMzpOmVwfIo/VaLHU5SE LTgJWCoMNiL7CsKmf41WYW3kTcgb71gEt7PR4DieKT2wtoaGfRh7abBDQ3VQFBePp8eJ XWT6tEC5R40ZAwl4WQsXyoIRwrOF7BxsovPWNky7Ll/O7UOx/GbLr8gomGjrcZYVhGxw /PUvWpm2cV6PSQ4S318Y+z1/8FNwT1fJzGSVVqJzMefim5UpM5jgBxVqIYANLT9V8Zj0 FMBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777344225; x=1777949025; 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=8gPkdpcG/AXzV2r8EJiMuqB5F6EPNovyteOK2fWIr2E=; b=sYlVifqB3KVbpsbdzo0HLkY3Rkaa2KM/5wXqEsAeyt1Oy3hIpLXMNXiSaAWTGqQUey Ait3VxjSPNWgiFzZt1JiQYnYjb8oN3rubxK3JFtE5KAqFOCSW7A66ObvxTIPyNsbkqE2 xIxNatgd/Pbw8tNN/R5PO1eRSA5cCUyJrdPwPGbQJ0gEH/eTCHB7azs+l3lS1PzvHLbR 6U/ZaDlYgILc6t5EvsjjpibSuzMUm4Ij/PWP8JTBlslziyj7qNUzblN9vvysLiihhUIK FV2tV4DouzPL6m89bld7SU1fALfeCIMYBawQTKSTc9I0BS+3kq6JigLYKFEdva0LHFjJ awEg== X-Forwarded-Encrypted: i=1; AFNElJ+qgeJe2piY2cxMib0DvsFeISo/QHEeyp0lIaNKDro55TJftruWJtSvJOzstMYhBfnoxKXMxjAUZzMd13o=@vger.kernel.org X-Gm-Message-State: AOJu0YwSB2M8aUZXMNYXLj1n7ZqI4DrpQyNFBSPLOZ0U2CYY6xDZXHPI 4g9ax9w+VWu2t4rdqym3vzEIU+tIE08WHPumL5uINBF3Dou+uUqMGMns X-Gm-Gg: AeBDieswNsMciv9OXZ1KkER/yGBRz/YhCbc70hLHDqfqO6Pu3qFzVR+i76pvmKCJic3 aUFTIh2QLSmYc+rwtRqKoQlUMISgr3dYoCXzotYYaCyFZhCbgXyv63WilKK2RR+qSWDDIDmWelm XCgrIhKSUflkznuHZObsygw0l9oJbpinAWW/432ufToUDmTA02tv+lieUXqj0uRHCKPGdLjBwZD gX+O1PabrptOAyiCggCUmsIIhNiIYWtDH+Y2r5xS4MmySILkC4Svhjc0wzqgFzNnPSxvbGw8hGm UvmAf1ugn/28yurjRwVrtWfRg8ZSAMYYouCHkdrPc52EGbC2uuH8/8LbS+ScwFO9JWZTO1nxEEg Mo+Ii9o2jOVGW7yJpkQV9B5XJgCNl8uEFeJmr8UIJDYBzu+Y/STyVe3HkLLS9PjvCFx/1vNQD0Z Xj0P7hOeAWC+nC8GSGiH9lmnv0dfdikBvWPEfZpEqwL5IkhuEWQHu/LUkehUKGqdkfrrpf X-Received: by 2002:a05:6870:568f:b0:42f:f390:d9 with SMTP id 586e51a60fabf-433f175a3a3mr718084fac.15.1777344224752; Mon, 27 Apr 2026 19:43:44 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-433efb816e4sm958392fac.1.2026.04.27.19.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 19:43:44 -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 3/4] iio: magnetometer: rm3100: Use guard(mutex)() in rm3100_set_samp_freq() Date: Mon, 27 Apr 2026 21:43:38 -0500 Message-ID: <20260428024339.45109-4-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428024339.45109-1-m32285159@gmail.com> References: <20260428024339.45109-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 --- drivers/iio/magnetometer/rm3100-core.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index 76824dcb1b73..a2c3448e296c 100644 --- a/drivers/iio/magnetometer/rm3100-core.c +++ b/drivers/iio/magnetometer/rm3100-core.c @@ -334,56 +334,49 @@ 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 05:10:49 2026 Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) (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 5B86D3A0E92 for ; Tue, 28 Apr 2026 02:43:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344238; cv=none; b=ZMc6FwoAH2LtbpyOd/chRoWzCv9OVsDsjBTfgyoOITPjQFMUguHk1Su64UU62DlKKyC2QzR4wWkDDyyGibRta2jm+RnoOowkWVqmZQja96Ca7W2V1KYVflhAP9Hc420dFDTgoC4nYl4eIdlGYEcuKj+x270nmjQKiwNWuG7tIJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777344238; c=relaxed/simple; bh=ogCmYkSPTvppIJTAZFH2UnNd6CEoSm+Sh+akJK6+6uY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YGqx0qYw1oKpRYUrohBJ0lbLzjEj20KWibjwkOMNyPLMrq4/2MF3GMFFbXjRi+NDFkBgKWCvUe3VOAEJEq9q9I6geaRlR3b5zKQKQ6/McJjW2CSfKum/ThUS0lWCLld3+zG2qwGaVHbwMLEWky3RjDWa588kxG0j1skIYqdffvg= 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=awzoGW5S; arc=none smtp.client-ip=209.85.160.53 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="awzoGW5S" Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-40f1a1f77a6so8080419fac.2 for ; Mon, 27 Apr 2026 19:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777344226; x=1777949026; 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=x9It474Q5BR2Rp1VOLDO7IGUOc7gU71s1Xr0iQWEeRI=; b=awzoGW5S8VVvo+LbJzSrfOpcV/80H/rGb2B5y9l9nwih/aMrW3rOcwrmWUfqr5jPds E0KkUXEfAn7MCUbEpoxZkHoYvkI2/iNbsQUWmYKAE3jLFmufBVe3o9czapi+iVJXuAXX fFyRV4GlYGZfjzNCWGCGF4EfCvgsfB9SiTO4sNb6TyyzuE+eY8RCUfJFOhIS7dwwyG9A X4sYTrxk+x3I8fy2y6pLJDxB63a2VmVJzARbbHTx3vcG4I9vgFrvZfg+FO38wYI/F7jF A5Pr3BJ7dqgtAik5Dj4ViWfjsp9H1pzZt3kq6cdwMroWkVvsEAZEItu/f3T0XUOZO5LK oKww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777344226; x=1777949026; 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=x9It474Q5BR2Rp1VOLDO7IGUOc7gU71s1Xr0iQWEeRI=; b=Ix87S0rRo+Qe30DfWuhWGZwrAMaDteSIxJ7KfaheobitW+iFDqb/55sd1Oqh1Taw54 f/Ide7C+Nzz2uO6+IsWffI/IBNSHPh6O9UYt+98Qkbod06tDXgTd7wMym1P55gj9CHRo Kmsk7f5C8w5e2b9pX2YIVg63tUohgtP8qNQMoPoeSPEgyV0Qg8fsQon92CzIN56bSfEu EsdDp2e+Rr19lWFT+RaAHQbAGSlUuqXYZx4QfNs8rF1lsSZqYodo2ADQ9BTqM/L7FByk 1iOwA4j4g1+nlG1HCEKaIbqHo7L3P00XTX3lmPLzK2SuXgS2LLKLlEl+lLMoqN6IA17M c6hw== X-Forwarded-Encrypted: i=1; AFNElJ9rG+D7PLOgPjW1xADHPSzDuWOJUakMnag+m45Ho52ArSFziYTj4zI6xhoUyEfx9kmfUeI+kg4cZewOpGc=@vger.kernel.org X-Gm-Message-State: AOJu0YxJO6PK8wCUz6Zn7ggJB/0AihsX5Ce0lu1tQL0izbh/2oUxvFy1 RhT52Z7TFZMZpC/RzJlSCd6pzi3wAQGgU3rs6ntRT84bAodP/z4FqRhL X-Gm-Gg: AeBDiev0x/bW+sutftDWrvqjiUxIdP+sdqeB3ka5Ap5dca/rR/QqBXx0FI7oL4lSWuV BC5QKl2DWPEoxjOwTDtoxcd/uIqOnlbkrrWvu4AtT7l1q33OFgNCyeQSHdRPh9SKZjgIk3n3cs/ 39sOtrncWh8JGJG8j0BgcmRScVk5EQp/NHK1rFdZhYAWF1i4zNWwDu5yG6Xpcb+OjBeNSNv95cC S1jkKXkYHlqkfTtGf+UGDV7T5hQL+duMwObRuKehjvhB/SQKRHPc/8WEQ36NOlkG6ObGz7dngsD o1/bP4Oo6RWUgSe0USXVrsWHcaiawkfYruVm39V3CRXtxZV7ACATadQsgxJCWHn45GWAVQf1exB hUTR90YVihQLyJsCyYNiMe7rLA63+mmWVeZ3xCLxt9Ae69qnIkP2+7fFlDvmQgWNbV/xXmLSI1/ fQglMcKRG2Bei1r7klTXiX/iQ5MLLgn8xA+7ZHjKA3UmyfMiHt6nnva+BAjMVUIB/o0kT9 X-Received: by 2002:a05:6870:14d0:b0:41c:a61:b612 with SMTP id 586e51a60fabf-433f385a6cbmr553741fac.1.1777344226281; Mon, 27 Apr 2026 19:43:46 -0700 (PDT) Received: from linuxescape.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-433efb816e4sm958392fac.1.2026.04.27.19.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 19:43:45 -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 4/4] iio: magnetometer: rm3100: Use scoped_guard in rm3100_trigger_handler() Date: Mon, 27 Apr 2026 21:43:39 -0500 Message-ID: <20260428024339.45109-5-m32285159@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428024339.45109-1-m32285159@gmail.com> References: <20260428024339.45109-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 scoped_guard(). This will help modernize the driver and bring it up-to-date with modern available macros/functions. Signed-off-by: Maxwell Doose --- drivers/iio/magnetometer/rm3100-core.c | 72 ++++++++++++-------------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/drivers/iio/magnetometer/rm3100-core.c b/drivers/iio/magnetome= ter/rm3100-core.c index a2c3448e296c..f55796e3ebef 100644 --- a/drivers/iio/magnetometer/rm3100-core.c +++ b/drivers/iio/magnetometer/rm3100-core.c @@ -457,48 +457,42 @@ 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); - 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. */ - for (i =3D 2; i > 0; i--) - memmove(data->buffer + i * 4, data->buffer + i * 3, 3); - 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); - break; - default: - 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); + scoped_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); + if (ret < 0) + goto done; + /* Convert XXXYYYZZZxxx to XXXxYYYxZZZx. x for paddings. */ + for (i =3D 2; i > 0; i--) + memmove(data->buffer + i * 4, data->buffer + i * 3, 3); + break; + case BIT(0) | BIT(1): + ret =3D regmap_bulk_read(regmap, RM3100_REG_MX2, data->buffer, 6); + 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); + 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); + if (ret < 0) + goto done; + memmove(data->buffer + 4, data->buffer + 6, 3); + break; + default: + 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) + goto done; } } - mutex_unlock(&data->lock); } /* * Always using the same buffer so that we wouldn't need to set the --=20 2.53.0