From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/magnetometer/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; - mutex_lock(&data->lock); + guard(mutex)(&data->lock); + ret = regmap_write(regmap, RM3100_REG_POLL, BIT(4 + idx)); if (ret < 0) - goto unlock_return; + return ret; ret = rm3100_wait_measurement(data); if (ret < 0) - goto unlock_return; + return ret; ret = regmap_bulk_read(regmap, RM3100_REG_MX2 + 3 * idx, buffer, 3); if (ret < 0) - goto unlock_return; - mutex_unlock(&data->lock); + return ret; *val = sign_extend32(get_unaligned_be24(&buffer[0]), 23); return IIO_VAL_INT; - -unlock_return: - mutex_unlock(&data->lock); - return ret; } #define RM3100_CHANNEL(axis, idx) \ -- 2.53.0