From nobody Mon Feb 9 13:02:26 2026 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 D33182FE05D for ; Sun, 8 Feb 2026 01:17:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770513438; cv=none; b=pgJKdjjTFIZ8eddh/Dlikf6TtMljsaskLief1/zLxrXXWnO8hgW+EAWMRUkWI5TXVcyNV+N/TkkXillBMIMr7e1CWbLHYRLG0I4seZDxsl8kBtDiV0pAbIkcXbLPgFAfniU/QuHFOutLTiPb/8KzTtth4WE9oOA7OmZKNG+TgSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770513438; c=relaxed/simple; bh=Sq4yboqJjhW/YcdDUsIXJhq+eoRSDISvfllebuk/UZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=npIwrhUGrfr/h4sKWqtdUv53eoHJbxmDSuKNXp206ha/GRwlqU0lztirdasTysaDKx3PkiR5BAwRN//Fei0gCMBn7g7E93MdObSyoqDNT2MJJNyi/lAfvoUr+DnGfnhD2yL+FN/kIlB644VZ8HkbhLneggrCAlqVdOtErnsa1Zc= 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=ftCRZ47P; arc=none smtp.client-ip=209.85.222.176 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="ftCRZ47P" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-8c711959442so359635985a.0 for ; Sat, 07 Feb 2026 17:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770513437; x=1771118237; 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=hJKnbhwPq4ROqJlUr/cylPdAkSeoEAJ5YNwTn8Q47Q0=; b=ftCRZ47P/a1n9MeUAhcTqB5mdJILdV7C6Enoespy6IeSgIzSumTU2pY1/cvqbS43op AIkV/fuDi1aMFLodk8B7nz2r9PE730+k272kM3J882s0N4I6WhXLCqfE5w1yxkamGBqR p4wl+DsXgZnPnGIfFBqT11H2HoAyHNP346OQy/XLGOiuRaroQ1zHlnXUpamW5du1ANLC aI57/cTWbKpVCrHQ+vPGXQ6pdY+EURM2Fdbn3Vs1/BuR51/JSWmSHc/45ltRcYnavRjp YoM07JpWrthKky/ycicSAsU5uM5ppw6UWGV33PaiIVm9TT4YiPHttNu1QJfJBGmlri/n UuNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770513437; x=1771118237; 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=hJKnbhwPq4ROqJlUr/cylPdAkSeoEAJ5YNwTn8Q47Q0=; b=FNawpc9tLdC8C0ygFEKkpWXFgyawO1Vso26EFucJaWWvUljfCTTEbU8BGCjfYAfUXJ WVV9y9cctGXwvEipueK3yrhJl9DpWovqJFJCvz54MOVqxr5P9suoZYUU0/9TpzyZPtvF i83XPgS3PuECgwL1TaJc8Gj1aa2zrUHC3dnS7qZ3tPMeSGTFpyoffU5kE+e3LNBnVHod QpT5EvjCjMaJ6hA2z0Ae+61IlQ90eumwxOpY4vigepnU+QwMGZ8wocTtiabs8sNNbS1z pbl8QOTBHIOBgeX0MIvaQpGiqTk8BEZNcghf1Q552XUTFZBOa9lbff9Tk4AGgINuloG8 LMvw== X-Forwarded-Encrypted: i=1; AJvYcCUmffHn1iDRRflloRpoKEBn+lIpm45T/fGx5fRbI/Od0hy0tHSvrAk8pYUTWAP5EVWYiKubyLt1zbWp9tI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/7LO7IbwRCCGEoG6ts1AqLifl5nDMeWJE8CXFFbw36No0Ar9p 3mtrIAv/VIQEsRQhSN3wYUwmswA9LwsJEhUzYxLnzxSflMEhjJALgyF1 X-Gm-Gg: AZuq6aIEwG4/GV/7/NqRx/yjaJiQbeqzvXX2MMEDtCpoApuCxW0unctYSaou3ef5g+X P3IsPgHqx6L589SXMuOXpAUlkzxtDjReX8om2ENhLSwCV8245NlnUj1CwRIwcPy14laaeQKZNvB cmiTmYrvRF+DPZ/6o3w5kuoHuwWDH6/sYqmnAkhlGNhXsR3aFi7oSi8uikyttATfa/pvHgRfDZB u1g6bs1avk2kejK9MnbW5HN1Cb7QKlylUERJGFfsAQkjiwZeQi9ihZhdfaD9LKK0oQx07DV2QMA sSPd9Zbb/MK2+8UZ3oUFBNyX+9WPd1Mdmla9jWjPaPK1AnFdWKrEecVW5Psiam9cK46XVVaMIM/ m/apgZNnVpcdqeMd/EwUllvi5skprWVk+blZMz9AdRspgcChNRvoSEDzVZ+b9CMDHPTm+0ObOGB AAGs6Yl23XVxvk9rXO2Xms8k2z8PHhUg== X-Received: by 2002:a05:620a:444f:b0:8c7:3ff0:d489 with SMTP id af79cd13be357-8cae06d85f5mr913830985a.1.1770513436601; Sat, 07 Feb 2026 17:17:16 -0800 (PST) Received: from localhost.localdomain ([50.21.71.60]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8caf4a97997sm481364385a.0.2026.02.07.17.17.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Feb 2026 17:17:16 -0800 (PST) From: Neel Bullywon To: Jonathan Cameron Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Neel Bullywon Subject: [PATCH v5 1/2] iio: magnetometer: bmc150_magn: use automated cleanup for mutex Date: Sat, 7 Feb 2026 20:16:58 -0500 Message-ID: <20260208011659.53722-2-neelb2403@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20260208011659.53722-1-neelb2403@gmail.com> References: <20260208011659.53722-1-neelb2403@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" Use guard() and scoped_guard() to replace manual mutex lock/unlock calls. This simplifies error handling and ensures RAII-style cleanup. Additionally, replace msleep(5) with fsleep(5000) to allow the kernel to select the most appropriate delay mechanism based on duration. guard() is used in read_raw, write_raw, trig_reen, trigger_set_state, and resume. Case blocks in read_raw and write_raw are wrapped in braces to ensure clear scope for the cleanup guards. scoped_guard() is used in remove, runtime_suspend, and suspend where a short mutex-protected scope is needed for a single function call. The trigger_handler function is left unchanged as mixing guard() with goto error paths can be fragile. Signed-off-by: Neel Bullywon --- drivers/iio/magnetometer/bmc150_magn.c | 132 ++++++++++--------------- 1 file changed, 54 insertions(+), 78 deletions(-) diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetome= ter/bmc150_magn.c index 6a73f6e2f1f0..117bf70d6899 100644 --- a/drivers/iio/magnetometer/bmc150_magn.c +++ b/drivers/iio/magnetometer/bmc150_magn.c @@ -11,6 +11,7 @@ =20 #include #include +#include #include #include #include @@ -456,29 +457,24 @@ static int bmc150_magn_read_raw(struct iio_dev *indio= _dev, case IIO_CHAN_INFO_RAW: if (iio_buffer_enabled(indio_dev)) return -EBUSY; - mutex_lock(&data->mutex); + { + guard(mutex)(&data->mutex); =20 - ret =3D bmc150_magn_set_power_state(data, true); - if (ret < 0) { - mutex_unlock(&data->mutex); - return ret; - } + ret =3D bmc150_magn_set_power_state(data, true); + if (ret < 0) + return ret; =20 - ret =3D bmc150_magn_read_xyz(data, values); - if (ret < 0) { - bmc150_magn_set_power_state(data, false); - mutex_unlock(&data->mutex); - return ret; - } - *val =3D values[chan->scan_index]; + ret =3D bmc150_magn_read_xyz(data, values); + if (ret < 0) { + bmc150_magn_set_power_state(data, false); + return ret; + } + *val =3D values[chan->scan_index]; =20 - ret =3D bmc150_magn_set_power_state(data, false); - if (ret < 0) { - mutex_unlock(&data->mutex); - return ret; + ret =3D bmc150_magn_set_power_state(data, false); + if (ret < 0) + return ret; } - - mutex_unlock(&data->mutex); return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: /* @@ -530,45 +526,37 @@ static int bmc150_magn_write_raw(struct iio_dev *indi= o_dev, case IIO_CHAN_INFO_SAMP_FREQ: if (val > data->max_odr) return -EINVAL; - mutex_lock(&data->mutex); - ret =3D bmc150_magn_set_odr(data, val); - mutex_unlock(&data->mutex); - return ret; + guard(mutex)(&data->mutex); + return bmc150_magn_set_odr(data, val); case IIO_CHAN_INFO_OVERSAMPLING_RATIO: switch (chan->channel2) { case IIO_MOD_X: case IIO_MOD_Y: if (val < 1 || val > 511) return -EINVAL; - mutex_lock(&data->mutex); - ret =3D bmc150_magn_set_max_odr(data, val, 0, 0); - if (ret < 0) { - mutex_unlock(&data->mutex); - return ret; + { + guard(mutex)(&data->mutex); + ret =3D bmc150_magn_set_max_odr(data, val, 0, 0); + if (ret < 0) + return ret; + return regmap_update_bits(data->regmap, + BMC150_MAGN_REG_REP_XY, + BMC150_MAGN_REG_REP_DATAMASK, + BMC150_MAGN_REPXY_TO_REGVAL(val)); } - ret =3D regmap_update_bits(data->regmap, - BMC150_MAGN_REG_REP_XY, - BMC150_MAGN_REG_REP_DATAMASK, - BMC150_MAGN_REPXY_TO_REGVAL - (val)); - mutex_unlock(&data->mutex); - return ret; case IIO_MOD_Z: if (val < 1 || val > 256) return -EINVAL; - mutex_lock(&data->mutex); - ret =3D bmc150_magn_set_max_odr(data, 0, val, 0); - if (ret < 0) { - mutex_unlock(&data->mutex); - return ret; + { + guard(mutex)(&data->mutex); + ret =3D bmc150_magn_set_max_odr(data, 0, val, 0); + if (ret < 0) + return ret; + return regmap_update_bits(data->regmap, + BMC150_MAGN_REG_REP_Z, + BMC150_MAGN_REG_REP_DATAMASK, + BMC150_MAGN_REPZ_TO_REGVAL(val)); } - ret =3D regmap_update_bits(data->regmap, - BMC150_MAGN_REG_REP_Z, - BMC150_MAGN_REG_REP_DATAMASK, - BMC150_MAGN_REPZ_TO_REGVAL - (val)); - mutex_unlock(&data->mutex); - return ret; default: return -EINVAL; } @@ -695,7 +683,7 @@ static int bmc150_magn_init(struct bmc150_magn_data *da= ta) * 3ms power-on time according to datasheet, let's better * be safe than sorry and set this delay to 5ms. */ - msleep(5); + fsleep(5000); =20 ret =3D bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_SUSPEND, false); @@ -782,9 +770,8 @@ static void bmc150_magn_trig_reen(struct iio_trigger *t= rig) if (!data->dready_trigger_on) return; =20 - mutex_lock(&data->mutex); + guard(mutex)(&data->mutex); ret =3D bmc150_magn_reset_intr(data); - mutex_unlock(&data->mutex); if (ret) dev_err(data->dev, "Failed to reset interrupt\n"); } @@ -794,32 +781,28 @@ static int bmc150_magn_data_rdy_trigger_set_state(str= uct iio_trigger *trig, { struct iio_dev *indio_dev =3D iio_trigger_get_drvdata(trig); struct bmc150_magn_data *data =3D iio_priv(indio_dev); - int ret =3D 0; + int ret; + + guard(mutex)(&data->mutex); =20 - mutex_lock(&data->mutex); if (state =3D=3D data->dready_trigger_on) - goto err_unlock; + return 0; =20 ret =3D regmap_update_bits(data->regmap, BMC150_MAGN_REG_INT_DRDY, BMC150_MAGN_MASK_DRDY_EN, state << BMC150_MAGN_SHIFT_DRDY_EN); if (ret < 0) - goto err_unlock; + return ret; =20 data->dready_trigger_on =3D state; =20 if (state) { ret =3D bmc150_magn_reset_intr(data); if (ret < 0) - goto err_unlock; + return ret; } - mutex_unlock(&data->mutex); =20 return 0; - -err_unlock: - mutex_unlock(&data->mutex); - return ret; } =20 static const struct iio_trigger_ops bmc150_magn_trigger_ops =3D { @@ -980,9 +963,8 @@ void bmc150_magn_remove(struct device *dev) if (data->dready_trig) iio_trigger_unregister(data->dready_trig); =20 - mutex_lock(&data->mutex); - bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_SUSPEND, true); - mutex_unlock(&data->mutex); + scoped_guard(mutex, &data->mutex) + bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_SUSPEND, true); =20 regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); } @@ -995,10 +977,9 @@ static int bmc150_magn_runtime_suspend(struct device *= dev) struct bmc150_magn_data *data =3D iio_priv(indio_dev); int ret; =20 - mutex_lock(&data->mutex); - ret =3D bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_SLEEP, - true); - mutex_unlock(&data->mutex); + scoped_guard(mutex, &data->mutex) + ret =3D bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_SLEEP, + true); if (ret < 0) { dev_err(dev, "powering off device failed\n"); return ret; @@ -1026,10 +1007,9 @@ static int bmc150_magn_suspend(struct device *dev) struct bmc150_magn_data *data =3D iio_priv(indio_dev); int ret; =20 - mutex_lock(&data->mutex); - ret =3D bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_SLEEP, - true); - mutex_unlock(&data->mutex); + scoped_guard(mutex, &data->mutex) + ret =3D bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_SLEEP, + true); =20 return ret; } @@ -1038,14 +1018,10 @@ static int bmc150_magn_resume(struct device *dev) { struct iio_dev *indio_dev =3D dev_get_drvdata(dev); struct bmc150_magn_data *data =3D iio_priv(indio_dev); - int ret; - - mutex_lock(&data->mutex); - ret =3D bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_NORMAL, - true); - mutex_unlock(&data->mutex); =20 - return ret; + guard(mutex)(&data->mutex); + return bmc150_magn_set_power_mode(data, BMC150_MAGN_POWER_MODE_NORMAL, + true); } #endif =20 --=20 2.44.0 From nobody Mon Feb 9 13:02:26 2026 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (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 22EE0202979 for ; Sun, 8 Feb 2026 01:17:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770513441; cv=none; b=Z6n6JT5X+PofHJhunw4wC2WiMhB3AYs8VDbcdiJpfKfiWN5YZzvBU0b2Yu9z+jgTmaXAJ5cXxrwHjLb/BtroqfC1fFiRSDm5AF+rIWAo1U191Jul6UjGwE3uFKMixdsXpi2++7v1hqRLyqnePvUDfySlS8ZUvW2+sui2Mzo+3SA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770513441; c=relaxed/simple; bh=hTMJMKgPKAcjJwsvkc1cKtMsNmA+nLdiKGssW1qJWY8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mz6un9B+TXImIRD1zgsNSlZ69W+dJptsL4CtSuvKn9slpIRMT8vZLPxkw2OXnGQ5H+cxahIQ0feSHAQNBkGB0lKh/ufySJw327Gu3r6xK242kk7QztWUNr2OJHo5jb9BhVbXrgS4a/rIwyIYHwPehDhOpyN6/W/L5VS036zIqoQ= 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=DyQQCa3a; arc=none smtp.client-ip=209.85.222.181 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="DyQQCa3a" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-8c6f21c2d81so340399985a.2 for ; Sat, 07 Feb 2026 17:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770513440; x=1771118240; 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=CQKUWbk2kffWFGeitl+6R3tmkJKGHBOuzEDPgFGOhGU=; b=DyQQCa3a1F1ph6Zbe0WBp+9irDUZjEl0FnIjuOQ7orNZSCPxT53e+EOyZ1V2uX/DRo CjlxwLCnYmHlPrbogro5byoxlQb4gJjdsqqOpP3TPoSAd4KyMV1QMn7z35kuNe+2o+HP fBQ7RrqjoaBpLb1OXl9lNZ9U973OPYhPYWs200PVFLAxcXaahhWMksxrlEKic5/qyXcF ktINcIFgJO0WSIKmsTT5TCcW9byPHYp1MzeOD/ydSOEFjkbxsEnm2dpdtbJkVn0N5jXw 3k60V4Pt87FmMr9Zo5XUR6eOhDgZdk1WvvzDXaHH74c982AvgjmcDMfFow9yZA253B6f qgYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770513440; x=1771118240; 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=CQKUWbk2kffWFGeitl+6R3tmkJKGHBOuzEDPgFGOhGU=; b=Irkbv3rJOpN3ib9/UJuX5/4BfNvwSTRXT/rIHhtU1x9bXRzptFJFP/TiE0E0u84jCN NSe+s7UBHRSFM3hBVdk/r1h29/w5tZqBXc6cajT7iletkJL9APlK+6Mg2YR7773Vh4Tn g09rMXiG6h8p29PznJesyV+KmmKx/VdIeCtT17ICZJhsLH6KCpvR7SfaGnIHeGxnTz8B jgrP4vTFFav5GJaahA1W5AhdM/FtlGBE89+L80zGHUBOO8ZDctO33RM6sYzsRQxcZjcX uqyffYbkHgzCqdzWBvRNm3GWTg008B1BZlAbkD5WFJgWcy/FbrPt7jwX+k3HHJhNEfYD HZQg== X-Forwarded-Encrypted: i=1; AJvYcCVeFwvvtjUq6nw50itAg4gs91goM7a0Bp5GRhtQbpve4+c+68LnMyW2xj5hnHa7pzTrLIOBTZPQeBuWkOI=@vger.kernel.org X-Gm-Message-State: AOJu0YzFtfuh5+zTK8SMKdv21sPl7UnPidM18JNPJsFelRdYH5BNiQou 3zuRCm4fRegxroTTEr1b0lob+ATmuzwR8XhMwj/AwkkUhoY1pENzS5OC X-Gm-Gg: AZuq6aKcSxzUUPFqaeWAaJZCzHcOOnk2tr8dWPUwqHaWpvlZLRH9gCXaO7UeEIXJzpc T73BX6DHupjBMTUzzetJUtqC/xAfeQcUGH2qafNqaznvyxi+24AixotpxQP1kpctfw5kZc7GZ7D ZGcg7wpqFk2c+mghBo+ZPKrxukP+hMxpsWx3A5OsnyI+f5XlWhODAjA4fUj1OQeybCIccpiLBfW khEqE+rSDGEaZVz2dT3nvEXFptFedk3tCqTE0yIJN4z+QkQO+4V+wTi3O06ROE59ZDsHJSKV2e/ Nf4qM6YE9Z1WPJ2r9AhZ5wOilzOXA+59uUXthtVDv31uaVfoFOlxHJ8pd2WxuVGle2xQ5LY2X5J B42pl6cwXE48i1nMSlVYDJdijRSY5EyJg3BsPi5v5f4oIBtEsNKn5YajbNrZCbWgEjt3OIUFhxy 8R/MAltgVKsqZJ7isImyvsaQFec03/lyqH9B1RbEOQ X-Received: by 2002:a05:620a:45ab:b0:8b1:8858:6ead with SMTP id af79cd13be357-8caefccac1emr1005834385a.11.1770513440056; Sat, 07 Feb 2026 17:17:20 -0800 (PST) Received: from localhost.localdomain ([50.21.71.60]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8caf4a97997sm481364385a.0.2026.02.07.17.17.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Feb 2026 17:17:19 -0800 (PST) From: Neel Bullywon To: Jonathan Cameron Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Neel Bullywon Subject: [PATCH v5 2/2] iio: magnetometer: bmc150_magn: minor formatting cleanup Date: Sat, 7 Feb 2026 20:16:59 -0500 Message-ID: <20260208011659.53722-3-neelb2403@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20260208011659.53722-1-neelb2403@gmail.com> References: <20260208011659.53722-1-neelb2403@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" Add spaces inside braces for initializer lists in the sampling frequency and preset tables for consistency. Fix indentation of bmc150_magn_scan_masks array and add trailing comma. No functional changes. Signed-off-by: Neel Bullywon --- drivers/iio/magnetometer/bmc150_magn.c | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetome= ter/bmc150_magn.c index 117bf70d6899..8e249e25b799 100644 --- a/drivers/iio/magnetometer/bmc150_magn.c +++ b/drivers/iio/magnetometer/bmc150_magn.c @@ -149,14 +149,14 @@ struct bmc150_magn_data { static const struct { int freq; u8 reg_val; -} bmc150_magn_samp_freq_table[] =3D { {2, 0x01}, - {6, 0x02}, - {8, 0x03}, - {10, 0x00}, - {15, 0x04}, - {20, 0x05}, - {25, 0x06}, - {30, 0x07} }; +} bmc150_magn_samp_freq_table[] =3D { { 2, 0x01 }, + { 6, 0x02 }, + { 8, 0x03 }, + { 10, 0x00 }, + { 15, 0x04 }, + { 20, 0x05 }, + { 25, 0x06 }, + { 30, 0x07 } }; =20 enum bmc150_magn_presets { LOW_POWER_PRESET, @@ -170,10 +170,10 @@ static const struct bmc150_magn_preset { u8 rep_z; u8 odr; } bmc150_magn_presets_table[] =3D { - [LOW_POWER_PRESET] =3D {3, 3, 10}, - [REGULAR_PRESET] =3D {9, 15, 10}, - [ENHANCED_REGULAR_PRESET] =3D {15, 27, 10}, - [HIGH_ACCURACY_PRESET] =3D {47, 83, 20}, + [LOW_POWER_PRESET] =3D { 3, 3, 10 }, + [REGULAR_PRESET] =3D { 9, 15, 10 }, + [ENHANCED_REGULAR_PRESET] =3D { 15, 27, 10 }, + [HIGH_ACCURACY_PRESET] =3D { 47, 83, 20 }, }; =20 #define BMC150_MAGN_DEFAULT_PRESET REGULAR_PRESET @@ -643,8 +643,9 @@ static const struct iio_info bmc150_magn_info =3D { }; =20 static const unsigned long bmc150_magn_scan_masks[] =3D { - BIT(AXIS_X) | BIT(AXIS_Y) | BIT(AXIS_Z), - 0}; + BIT(AXIS_X) | BIT(AXIS_Y) | BIT(AXIS_Z), + 0, +}; =20 static irqreturn_t bmc150_magn_trigger_handler(int irq, void *p) { --=20 2.44.0