From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/magnetometer/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, void *p) struct regmap *regmap = data->regmap; int ret, i, bit; - mutex_lock(&data->lock); + guard(mutex)(&data->lock); + switch (scan_mask) { case BIT(0) | BIT(1) | BIT(2): ret = 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, void *p) break; case BIT(0) | BIT(1): ret = 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 = 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 = 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, void *p) for_each_set_bit(bit, &scan_mask, mask_len) { ret = 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 -- 2.53.0