tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: imu: inv_icm42600: make use of regmap_clear_bits(), regmap_set_bits()

Instead of using regmap_update_bits() and passing the mask twice, use
regmap_set_bits().

Instead of using regmap_update_bits() and passing val = 0, use
regmap_clear_bits().

Suggested-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Acked-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20240617-review-v3-27-88d1338c4cca@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Trevor Gamblin and committed by
Jonathan Cameron 0e59dc9e 51373588

+14 -17
+6 -8
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
··· 274 274 275 275 /* restore watermark interrupt */ 276 276 if (restore) { 277 - ret = regmap_update_bits(st->map, INV_ICM42600_REG_INT_SOURCE0, 278 - INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN, 279 - INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN); 277 + ret = regmap_set_bits(st->map, INV_ICM42600_REG_INT_SOURCE0, 278 + INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN); 280 279 if (ret) 281 280 return ret; 282 281 } ··· 317 318 } 318 319 319 320 /* set FIFO threshold interrupt */ 320 - ret = regmap_update_bits(st->map, INV_ICM42600_REG_INT_SOURCE0, 321 - INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN, 322 - INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN); 321 + ret = regmap_set_bits(st->map, INV_ICM42600_REG_INT_SOURCE0, 322 + INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN); 323 323 if (ret) 324 324 goto out_unlock; 325 325 ··· 373 375 goto out_unlock; 374 376 375 377 /* disable FIFO threshold interrupt */ 376 - ret = regmap_update_bits(st->map, INV_ICM42600_REG_INT_SOURCE0, 377 - INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN, 0); 378 + ret = regmap_clear_bits(st->map, INV_ICM42600_REG_INT_SOURCE0, 379 + INV_ICM42600_INT_SOURCE0_FIFO_THS_INT1_EN); 378 380 if (ret) 379 381 goto out_unlock; 380 382
+4 -5
drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
··· 496 496 return ret; 497 497 498 498 /* sensor data in big-endian (default) */ 499 - ret = regmap_update_bits(st->map, INV_ICM42600_REG_INTF_CONFIG0, 500 - INV_ICM42600_INTF_CONFIG0_SENSOR_DATA_ENDIAN, 501 - INV_ICM42600_INTF_CONFIG0_SENSOR_DATA_ENDIAN); 499 + ret = regmap_set_bits(st->map, INV_ICM42600_REG_INTF_CONFIG0, 500 + INV_ICM42600_INTF_CONFIG0_SENSOR_DATA_ENDIAN); 502 501 if (ret) 503 502 return ret; 504 503 ··· 602 603 return ret; 603 604 604 605 /* Deassert async reset for proper INT pin operation (cf datasheet) */ 605 - ret = regmap_update_bits(st->map, INV_ICM42600_REG_INT_CONFIG1, 606 - INV_ICM42600_INT_CONFIG1_ASYNC_RESET, 0); 606 + ret = regmap_clear_bits(st->map, INV_ICM42600_REG_INT_CONFIG1, 607 + INV_ICM42600_INT_CONFIG1_ASYNC_RESET); 607 608 if (ret) 608 609 return ret; 609 610
+2 -2
drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c
··· 28 28 INV_ICM42600_INTF_CONFIG6_MASK, 29 29 INV_ICM42600_INTF_CONFIG6_I3C_EN); 30 30 31 - ret = regmap_update_bits(st->map, INV_ICM42600_REG_INTF_CONFIG4, 32 - INV_ICM42600_INTF_CONFIG4_I3C_BUS_ONLY, 0); 31 + ret = regmap_clear_bits(st->map, INV_ICM42600_REG_INTF_CONFIG4, 32 + INV_ICM42600_INTF_CONFIG4_I3C_BUS_ONLY); 33 33 if (ret) 34 34 return ret; 35 35
+2 -2
drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c
··· 27 27 if (ret) 28 28 return ret; 29 29 30 - ret = regmap_update_bits(st->map, INV_ICM42600_REG_INTF_CONFIG4, 31 - INV_ICM42600_INTF_CONFIG4_I3C_BUS_ONLY, 0); 30 + ret = regmap_clear_bits(st->map, INV_ICM42600_REG_INTF_CONFIG4, 31 + INV_ICM42600_INTF_CONFIG4_I3C_BUS_ONLY); 32 32 if (ret) 33 33 return ret; 34 34