From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f68.google.com (mail-dl1-f68.google.com [74.125.82.68]) (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 B5FD9363C48 for ; Wed, 10 Jun 2026 04:24:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781065476; cv=none; b=BeXMMbW88nV6bvt8FmtpYI/igQmcGnxlHIzsi9QDP48muy88O8rzhVv3f++YZJOlDQUY70c2Gbv7aiStoWNgMxQ9Tqsq+6U56Ywsn59eTdYv6IQBa0cVS3nh6i7i2n6BNRP7/iLgUgUsukw6zGsOxbqdp5cB244QxkLyJI+CcgQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781065476; c=relaxed/simple; bh=9M5GPmdNqIXqkG9CpsR2NODL59ShANf4I82yZOxyN2Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IHT6U5G2FIEj5z7Di5JFcNMHoezqGO8jmfaaoTgnDqC4kKNyNnM8ECsQ3sgiQlXnq8VJmriw4kvENJNJL3yOVBJ+3vmE4lVv8bySqzA/oLadsw6q5xrepwoiE44Kn4LhRy+sjsVmj2zyMtr9FFUCczu7+G1yy4heez5i6h1Y70M= 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=cF5yS1ET; arc=none smtp.client-ip=74.125.82.68 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="cF5yS1ET" Received: by mail-dl1-f68.google.com with SMTP id a92af1059eb24-137335bc3caso7996173c88.0 for ; Tue, 09 Jun 2026 21:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781065475; x=1781670275; 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=3jjXyfjM9Y5GYTs/KbPwC5lsFRedcbtN53s1l4Z8gmM=; b=cF5yS1ETCgRWu4rxRvSVqd1Vx76SkbZ6APUOI1JcSiMoJk070YdE0h9iuUms99l9HT bdKaYbwRg3RMXbsilNIxGOS2U0fbUpN+LH2h5Asgug9czvlB4MV0hIAzi396/qQB+W0W gMn3B0F00zbH23t0IsFtlvy34BvjFJO+NUzT/Aq6Tns3WiUHvXuqbKv4ye2wHw68MWEy 80evx9kbaEvCATBkKWEfbCrd9Y9MZ0quKgL/F+qdfoy1ClPnhzJ81BJkPKAUGURGDy3h YlzA+fZMUUa7G4Wdhjc0gRqLwXv4dn5o8ZTxUg8ZY/O9pxOx+gsf22oMfqq5C16bXcKZ ++TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781065475; x=1781670275; 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=3jjXyfjM9Y5GYTs/KbPwC5lsFRedcbtN53s1l4Z8gmM=; b=fdC8U29SdB4omoRYgrWjc605UBzB6OFaL7qGQ4/6YRXyF/BBS3Ik/PRNyS1URxwylc dt7Ef6tAVHApceA7VI66Zy5mVfzLY9OMF5utrY/CZ6Pwl3CW13kkKt+odqk0Xt8ZSKrP Q4d49UbSCGhHsSUF0AkjVHpErs6q1Z/69jbDXG00RGJvkpjrESLKc+DrCLeh0vkEII+K mRFEbZsZWsND4Crx0KiAhzddFcTmqRtTekXiXht1HQu4dIUS6o/zTvEpz1Z1PTvf+yHN AVX9JOr05UJ2zY0xSdH3P6RSt1HCitcqVysx1isPQvWPAWOZ6SJ/5d847Eyh34NoxVOW /QOQ== X-Forwarded-Encrypted: i=1; AFNElJ+sraDbjc612kiHTEnVsf8qrmOll3LgwrSQMVoq9AjndkD4asLet5UMgcjrt61oU7rcirXSmuO+9hLk1UE=@vger.kernel.org X-Gm-Message-State: AOJu0Yxj4saf30dbo6TIkt9ZKe6V9AEGG83zPp1t1gW7KyMs3EbWCaIM K3PbIUnc7uLlwd7JVosYGhEliYAY1nflp7UBh+9J0gDUT/exiapB6ira X-Gm-Gg: Acq92OGru0kpHZXcQpmdWRxYaJ7Qk4FNuQrY+Codl1ZSbD6oCJmMZGyRWJLB6GQ7ZoT LitGjH17IKwi376vmKt713VTUe6gqUgXsJhTdwGXXyx6Xg9lta+cWgwYvwMLEK7EVsP1qxGM/rS 1lLgqcComOrhdXctO8a/oVsbF8+6cppfCxlORAc+YbYU3V6rVj3aezHAj5CJJfSVKi5rPU2YMxd GOs4IDfmKFfn2bz2PFdPB0DbF9Ig9qw1pMkhEOsjI+dZDX9YzjPPfjS6OlFraakCRzlGm55Oj4f 5+0UabBTOcpBEOkGmByA0yOnV2mLpVemGlZJp2QoaKbSuoP/qJ986FL6Gn84WI0Ftd1hEaVQKww ZbDpA5q41gdIGHVG67g2VJNPY7ymxZyNzFghzj4SdiKRGjie+UEmBfNNjy1BuCPOf0pwRLaVjVc ybO3bKuU2rPtdd13Z/OGkd/MZzsJ/Ch9ooTgoQfl84HYq1Gt9uWSzF1p3QuTZqsqR1Fw== X-Received: by 2002:a05:7022:2222:b0:138:63d:e328 with SMTP id a92af1059eb24-138065b6855mr11419781c88.0.1781065474802; Tue, 09 Jun 2026 21:24:34 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1381495bb00sm10941619c88.3.2026.06.09.21.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 21:24:34 -0700 (PDT) From: Hungyu Lin 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, Hungyu Lin Subject: [PATCH 2/2] iio: magnetometer: bmc150: use FIELD_PREP and FIELD_GET helpers Date: Wed, 10 Jun 2026 04:24:18 +0000 Message-Id: <20260610042418.90308-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260610042418.90308-1-dennylin0707@gmail.com> References: <20260610042418.90308-1-dennylin0707@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 open-coded bitfield operations with FIELD_PREP() and FIELD_GET() helpers where appropriate. Also simplify bmc150_magn_set_odr() by returning directly from the matching table entry. Signed-off-by: Hungyu Lin --- drivers/iio/magnetometer/bmc150_magn.c | 34 ++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c index 6f2a4a863fbe..c402ac852efb 100644 --- a/drivers/iio/magnetometer/bmc150_magn.c +++ b/drivers/iio/magnetometer/bmc150_magn.c @@ -9,6 +9,7 @@ * (C) Copyright 2011~2014 Bosch Sensortec GmbH All Rights Reserved */ +#include #include #include #include @@ -245,14 +246,14 @@ static int bmc150_magn_set_power_mode(struct bmc150_magn_data *data, return regmap_update_bits(data->regmap, BMC150_MAGN_REG_OPMODE_ODR, BMC150_MAGN_MASK_OPMODE, - BMC150_MAGN_MODE_SLEEP << - BMC150_MAGN_SHIFT_OPMODE); + FIELD_PREP(BMC150_MAGN_MASK_OPMODE, + BMC150_MAGN_MODE_SLEEP)); case BMC150_MAGN_POWER_MODE_NORMAL: return regmap_update_bits(data->regmap, BMC150_MAGN_REG_OPMODE_ODR, BMC150_MAGN_MASK_OPMODE, - BMC150_MAGN_MODE_NORMAL << - BMC150_MAGN_SHIFT_OPMODE); + FIELD_PREP(BMC150_MAGN_MASK_OPMODE, + BMC150_MAGN_MODE_NORMAL)); } return -EINVAL; @@ -290,7 +291,8 @@ static int bmc150_magn_get_odr(struct bmc150_magn_data *data, int *val) ret = regmap_read(data->regmap, BMC150_MAGN_REG_OPMODE_ODR, ®_val); if (ret < 0) return ret; - odr_val = (reg_val & BMC150_MAGN_MASK_ODR) >> BMC150_MAGN_SHIFT_ODR; + + odr_val = FIELD_GET(BMC150_MAGN_MASK_ODR, reg_val); for (i = 0; i < ARRAY_SIZE(bmc150_magn_samp_freq_table); i++) if (bmc150_magn_samp_freq_table[i].reg_val == odr_val) { @@ -303,21 +305,17 @@ static int bmc150_magn_get_odr(struct bmc150_magn_data *data, int *val) static int bmc150_magn_set_odr(struct bmc150_magn_data *data, int val) { - int ret; u8 i; for (i = 0; i < ARRAY_SIZE(bmc150_magn_samp_freq_table); i++) { - if (bmc150_magn_samp_freq_table[i].freq == val) { - ret = regmap_update_bits(data->regmap, - BMC150_MAGN_REG_OPMODE_ODR, - BMC150_MAGN_MASK_ODR, - bmc150_magn_samp_freq_table[i]. - reg_val << - BMC150_MAGN_SHIFT_ODR); - if (ret < 0) - return ret; - return 0; - } + if (bmc150_magn_samp_freq_table[i].freq != val) + continue; + + return regmap_update_bits(data->regmap, + BMC150_MAGN_REG_OPMODE_ODR, + BMC150_MAGN_MASK_ODR, + FIELD_PREP(BMC150_MAGN_MASK_ODR, + bmc150_magn_samp_freq_table[i].reg_val)); } return -EINVAL; @@ -800,7 +798,7 @@ static int bmc150_magn_data_rdy_trigger_set_state(struct iio_trigger *trig, ret = regmap_update_bits(data->regmap, BMC150_MAGN_REG_INT_DRDY, BMC150_MAGN_MASK_DRDY_EN, - state << BMC150_MAGN_SHIFT_DRDY_EN); + FIELD_PREP(BMC150_MAGN_MASK_DRDY_EN, state)); if (ret < 0) return ret; -- 2.34.1