MAINTAINERS: add missing files to the adis lib
Nuno Sá
maintainerPATCH 1/3 MAINTAINERS: add missing files to the adis lib
The triggered buffer support was missing in the MAINTAINERS file. Add them.
Signed-off-by Nuno Sá <[email protected]>
--- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+)
MAINTAINERS +2 -0
@@ -1103,6 +1103,8 @@ M: Nuno Sa <[email protected]> L: [email protected] S: Supported F: drivers/iio/imu/adis.c +F: drivers/iio/imu/adis_buffer.c +F: drivers/iio/imu/adis_trigger.c F: include/linux/iio/imu/adis.h ANALOG DEVICES INC ADIS16460 DRIVER
Signature · 1 line
2.34.1
Nuno Sá
maintainerPATCH 2/3 adis: simplify 'adis_update_bits' macros
There's no need to use '__builtin_choose_expr' to choose the right call to 'adis_update_bits_base()'. We can change the 'BUILD_BUG_ON()' condition so that it makes sure only the supported sizes are passed in. With that, we can just use 'sizeof(val)' as the size argument of 'adis_update_bits_base()'.
Signed-off-by Nuno Sá <[email protected]>
--- include/linux/iio/imu/adis.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
include/linux/iio/imu/adis.h +4 -8
@@ -381,10 +381,8 @@ static inline int adis_update_bits_base(struct adis *adis, unsigned int reg,* @val can lead to undesired behavior if the register to update is 16bit. */ #define adis_update_bits (adis, reg, mask, val) ({ \ - BUILD_BUG_ON(sizeof(val) == 1 || sizeof(val) == 8); \ - __builtin_choose_expr(sizeof(val) == 4, \ - adis_update_bits_base(adis, reg, mask, val, 4), \ - adis_update_bits_base(adis, reg, mask, val, 2)); \ + BUILD_BUG_ON(sizeof(val) != 2 && sizeof(val) == 4); \ + adis_update_bits_base(adis, reg, mask, val, sizeof(val)); \ })/**
@@ -399,10 +397,8 @@ static inline int adis_update_bits_base(struct adis *adis, unsigned int reg,* @val can lead to undesired behavior if the register to update is 16bit. */ #define __adis_update_bits (adis, reg, mask, val) ({ \ - BUILD_BUG_ON(sizeof(val) == 1 || sizeof(val) == 8); \ - __builtin_choose_expr(sizeof(val) == 4, \ - __adis_update_bits_base(adis, reg, mask, val, 4), \ - __adis_update_bits_base(adis, reg, mask, val, 2)); \ + BUILD_BUG_ON(sizeof(val) != 2 && sizeof(val) != 4); \ + __adis_update_bits_base(adis, reg, mask, val, sizeof(val)); \ })int adis_enable_irq (struct adis *adis,bool enable);
Signature · 1 line
2.34.1
Nuno Sá
maintainerPATCH 3/3 iio: adis: stylistic changes
In reply to Nuno SáMinor stylistic changes to address checkptach complains when called with '--strict'.
Signed-off-by Nuno Sá <[email protected]>
--- drivers/iio/imu/adis.c | 47 +++++++++++++++++---------------- drivers/iio/imu/adis_buffer.c | 6 ++--- drivers/iio/imu/adis_trigger.c | 3 +-- include/linux/iio/imu/adis.h | 48 ++++++++++++++++++---------------- 4 files changed, 54 insertions(+), 50 deletions(-)
drivers/iio/imu/adis.c +25 -22
@@ -30,8 +30,8 @@* @value: The value to write to device (up to 4 bytes) * @size: The size of the @value (in bytes) */ -int __adis_write_reg (struct adis *adis,unsigned int reg, -unsigned int value,unsigned int size) +int __adis_write_reg (struct adis *adis,unsigned int reg,unsigned int value, +unsigned int size) {unsigned int page = reg /ADIS_PAGE_SIZE ;int ret, i;
@@ -114,7 +114,7 @@ int __adis_write_reg(struct adis *adis, unsigned int reg, ret =spi_sync (adis->spi, &msg);if (ret) {dev_err (&adis->spi->dev,"Failed to write register 0x%02X: %d\n" , - reg, ret); + reg, ret); }else { adis->current_page = page; }
@@ -130,8 +130,8 @@ EXPORT_SYMBOL_GPL(__adis_write_reg);* @val: The value read back from the device * @size: The size of the @val buffer */ -int __adis_read_reg (struct adis *adis,unsigned int reg, -unsigned int *val,unsigned int size) +int __adis_read_reg (struct adis *adis,unsigned int reg,unsigned int *val, +unsigned int size) {unsigned int page = reg /ADIS_PAGE_SIZE ;struct spi_message msg;
@@ -201,12 +201,12 @@ int __adis_read_reg(struct adis *adis, unsigned int reg, ret =spi_sync (adis->spi, &msg);if (ret) {dev_err (&adis->spi->dev,"Failed to read register 0x%02X: %d\n" , - reg, ret); + reg, ret);return ret; - }else { - adis->current_page = page; } + adis->current_page = page; +switch (size) {case 4 : *val =get_unaligned_be32 (adis->rx);
@@ -247,13 +247,13 @@ EXPORT_SYMBOL_GPL(__adis_update_bits_base);#ifdef CONFIG_DEBUG_FS -int adis_debugfs_reg_access (struct iio_dev *indio_dev, -unsigned int reg,unsigned int writeval,unsigned int *readval) +int adis_debugfs_reg_access (struct iio_dev *indio_dev,unsigned int reg, +unsigned int writeval,unsigned int *readval) {struct adis *adis =iio_device_get_drvdata (indio_dev);if (readval) { -uint16_t val16; +u16 val16;int ret; ret =adis_read_reg_16 (adis, reg, &val16);
@@ -261,9 +261,9 @@ int adis_debugfs_reg_access(struct iio_dev *indio_dev, *readval = val16;return ret; - }else { -return adis_write_reg_16 (adis, reg, writeval); } + +return adis_write_reg_16 (adis, reg, writeval); }EXPORT_SYMBOL (adis_debugfs_reg_access);
@@ -279,14 +279,16 @@ EXPORT_SYMBOL(adis_debugfs_reg_access);int adis_enable_irq (struct adis *adis,bool enable) {int ret =0 ; -uint16_t msc; +u16 msc;mutex_lock (&adis->state_lock);if (adis->data->enable_irq) { ret = adis->data->enable_irq (adis, enable); goto out_unlock; - }else if (adis->data->unmasked_drdy) { + } + +if (adis->data->unmasked_drdy) {if (enable)enable_irq (adis->spi->irq);else
@@ -322,7 +324,7 @@ EXPORT_SYMBOL(adis_enable_irq);*/ int __adis_check_status (struct adis *adis) { -uint16_t status; +u16 status;int ret;int i;
@@ -358,7 +360,7 @@ int __adis_reset(struct adis *adis)const struct adis_timeout *timeouts = adis->data->timeouts; ret =__adis_write_reg_8 (adis, adis->data->glob_cmd_reg, -ADIS_GLOB_CMD_SW_RESET ); +ADIS_GLOB_CMD_SW_RESET );if (ret) {dev_err (&adis->spi->dev,"Failed to reset device: %d\n" , ret);return ret;
@@ -414,7 +416,7 @@ int __adis_initial_startup(struct adis *adis) {const struct adis_timeout *timeouts = adis->data->timeouts;struct gpio_desc *gpio; -uint16_t prod_id; +u16 prod_id;int ret;/* check if the device has rst pin low */
@@ -423,7 +425,7 @@ int __adis_initial_startup(struct adis *adis)return PTR_ERR (gpio);if (gpio) { -msleep (10 ); +usleep_range (10 ,12 );/* bring device out of reset */ gpiod_set_value_cansleep (gpio,0 );msleep (timeouts->reset_ms);
@@ -477,7 +479,8 @@ EXPORT_SYMBOL_GPL(__adis_initial_startup);* a error bit in the channels raw value set error_mask to 0. */ int adis_single_conversion (struct iio_dev *indio_dev, -const struct iio_chan_spec *chan,unsigned int error_mask,int *val) +const struct iio_chan_spec *chan, +unsigned int error_mask,int *val) {struct adis *adis =iio_device_get_drvdata (indio_dev);unsigned int uval;
@@ -486,7 +489,7 @@ int adis_single_conversion(struct iio_dev *indio_dev,mutex_lock (&adis->state_lock); ret =__adis_read_reg (adis, chan->address, &uval, - chan->scan_type.storagebits /8 ); + chan->scan_type.storagebits /8 );if (ret) goto err_unlock;
@@ -521,7 +524,7 @@ EXPORT_SYMBOL_GPL(adis_single_conversion);* called. */ int adis_init (struct adis *adis,struct iio_dev *indio_dev, -struct spi_device *spi,const struct adis_data *data) +struct spi_device *spi,const struct adis_data *data) {if (!data || !data->timeouts) {dev_err (&spi->dev,"No config data or timeouts not defined!\n" );
drivers/iio/imu/adis_buffer.c +3 -3
@@ -20,7 +20,7 @@#include <linux/iio/imu/adis.h> static int adis_update_scan_mode_burst (struct iio_dev *indio_dev, -const unsigned long *scan_mask) +const unsigned long *scan_mask) {struct adis *adis =iio_device_get_drvdata (indio_dev);unsigned int burst_length, burst_max_length;
@@ -67,7 +67,7 @@ static int adis_update_scan_mode_burst(struct iio_dev *indio_dev, }int adis_update_scan_mode (struct iio_dev *indio_dev, -const unsigned long *scan_mask) +const unsigned long *scan_mask) {struct adis *adis =iio_device_get_drvdata (indio_dev);const struct iio_chan_spec *chan;
@@ -158,7 +158,7 @@ static irqreturn_t adis_trigger_handler(int irq, void *p) }iio_push_to_buffers_with_timestamp (indio_dev, adis->buffer, - pf->timestamp); + pf->timestamp); irq_done:iio_trigger_notify_done (indio_dev->trig);
drivers/iio/imu/adis_trigger.c +1 -2
@@ -15,8 +15,7 @@#include <linux/iio/trigger.h> #include <linux/iio/imu/adis.h> -static int adis_data_rdy_trigger_set_state (struct iio_trigger *trig, -bool state) +static int adis_data_rdy_trigger_set_state (struct iio_trigger *trig,bool state) {struct adis *adis =iio_trigger_get_drvdata (trig);
include/linux/iio/imu/adis.h +25 -23
172 lines not on this page · raw message
Signature · 1 line
2.34.1