iio: magnetometer: bmc150: use FIELD_PREP and FIELD_GET helpers
v5 cover iio: magnetometer: bmc150: use FIELD_PREP and FIELD_GET helpers
v5:
- Remove the extra blank line in bmc150_magn_get_odr() that was inadvertently retained in v4
v4:
- Split include sorting into a separate prerequisite patch
v3:
- Add missing include <linux/bitfield.h>
v2:
- Use FIELD_PREP() and FIELD_GET() helpers as suggested by Jonathan Cameron
- Simplify bmc150_magn_set_odr() by returning directly from the matching table entry
Hungyu Lin (2):
iio: magnetometer: bmc150: sort includes
iio: magnetometer: bmc150: use FIELD_PREP and FIELD_GET helpers
drivers/iio/magnetometer/bmc150_magn.c | 49 ++++++++++++-------------- 1 file changed, 23 insertions(+), 26 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/2 iio: magnetometer: bmc150: sort includes
Sort the include list alphabetically.
--- drivers/iio/magnetometer/bmc150_magn.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/iio/magnetometer/bmc150_magn.c +8 -8
@@ -9,23 +9,23 @@* (C) Copyright 2011~2014 Bosch Sensortec GmbH All Rights Reserved */ -#include <linux/module.h> -#include <linux/i2c.h> -#include <linux/interrupt.h> #include <linux/cleanup.h> #include <linux/delay.h> -#include <linux/slab.h> -#include <linux/pm.h> -#include <linux/pm_runtime.h> -#include <linux/iio/iio.h> -#include <linux/iio/sysfs.h> +#include <linux/i2c.h> #include <linux/iio/buffer.h> #include <linux/iio/events.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> #include <linux/iio/trigger.h> #include <linux/iio/trigger_consumer.h> #include <linux/iio/triggered_buffer.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> +#include <linux/slab.h> #include "bmc150_magn.h"
Signature · 1 line
2.34.1
PATCH v5 2/2 iio: magnetometer: bmc150: use FIELD_PREP and FIELD_GET helpers
In reply to Hungyu LinReplace 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.
--- drivers/iio/magnetometer/bmc150_magn.c | 33 ++++++++++++-------------- 1 file changed, 15 insertions(+), 18 deletions(-)
drivers/iio/magnetometer/bmc150_magn.c +15 -18
@@ -9,6 +9,7 @@* (C) Copyright 2011~2014 Bosch Sensortec GmbH All Rights Reserved */ +#include <linux/bitfield.h> #include <linux/cleanup.h> #include <linux/delay.h> #include <linux/i2c.h>
@@ -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,7 @@ 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 +304,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 +797,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;
Signature · 1 line
2.34.1