From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/magnetometer/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; - mutex_lock(&data->lock); + guard(mutex)(&data->lock); /* All cycle count registers use the same value. */ ret = regmap_read(regmap, RM3100_REG_CC_X, &cycle_count); if (ret < 0) - goto unlock_return; + return ret; for (i = 0; i < RM3100_SAMP_NUM; i++) { if (val == rm3100_samp_rates[i][0] && val2 == rm3100_samp_rates[i][1]) break; } - if (i == RM3100_SAMP_NUM) { - ret = -EINVAL; - goto unlock_return; - } + if (i == RM3100_SAMP_NUM) + return -EINVAL; ret = regmap_write(regmap, RM3100_REG_TMRC, i + RM3100_TMRC_OFFSET); if (ret < 0) - goto unlock_return; + return ret; /* Checking if cycle count registers need changing. */ if (val == 600 && cycle_count == 200) { ret = rm3100_set_cycle_count(data, 100); if (ret < 0) - goto unlock_return; + return ret; } else if (val != 600 && cycle_count == 100) { ret = rm3100_set_cycle_count(data, 200); if (ret < 0) - goto unlock_return; + return ret; } if (iio_buffer_enabled(indio_dev)) { /* Writing TMRC registers requires CMM reset. */ ret = regmap_write(regmap, RM3100_REG_CMM, 0); if (ret < 0) - goto unlock_return; + return ret; ret = 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); data->conversion_time = rm3100_samp_rates[i][2] * 2; return 0; - -unlock_return: - mutex_unlock(&data->lock); - return ret; } static int rm3100_read_raw(struct iio_dev *indio_dev, -- 2.53.0