| Message ID | 3880510489f196d93ccb3ef7551e0216009d4a10.1520164945.git.shreeya.patel23498@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, 4 Mar 2018 18:11:17 +0530 Shreeya Patel <shreeya.patel23498@gmail.com> wrote: > Make some of the macro names according to the names > given in the datasheet of the adis16209 driver. > > Signed-off-by: Shreeya Patel <shreeya.patel23498@gmail.com> A small comment inline which we should clear up in a follow up patch. > --- > > Changes in v3 > -Introduce this new patch for v3 of the series. > > drivers/staging/iio/accel/adis16209.c | 48 +++++++++++++++++------------------ > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/drivers/staging/iio/accel/adis16209.c b/drivers/staging/iio/accel/adis16209.c > index d8aef9c..eb5c878 100644 > --- a/drivers/staging/iio/accel/adis16209.c > +++ b/drivers/staging/iio/accel/adis16209.c > @@ -68,21 +68,21 @@ > #define ADIS16209_MSC_CTRL_ACTIVE_HIGH BIT(1) > #define ADIS16209_MSC_CTRL_DATA_RDY_DIO2 BIT(0) > > -#define ADIS16209_DIAG_STAT_REG 0x3C > -#define ADIS16209_DIAG_STAT_ALARM2 BIT(9) > -#define ADIS16209_DIAG_STAT_ALARM1 BIT(8) > -#define ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT 5 > -#define ADIS16209_DIAG_STAT_SPI_FAIL_BIT 3 > -#define ADIS16209_DIAG_STAT_FLASH_UPT_BIT 2 > +#define ADIS16209_STAT_REG 0x3C > +#define ADIS16209_STAT_ALARM2 BIT(9) > +#define ADIS16209_STAT_ALARM1 BIT(8) > +#define ADIS16209_STAT_SELFTEST_FAIL_BIT 5 > +#define ADIS16209_STAT_SPI_FAIL_BIT 3 > +#define ADIS16209_STAT_FLASH_UPT_FAIL_BIT 2 Given these are also fields of the STAT_REG, be it defined in a different fashion I think they should also have the small additional indent. > /* Power supply above 3.625 V */ > -#define ADIS16209_DIAG_STAT_POWER_HIGH_BIT 1 > +#define ADIS16209_STAT_POWER_HIGH_BIT 1 > /* Power supply below 3.15 V */ > -#define ADIS16209_DIAG_STAT_POWER_LOW_BIT 0 > +#define ADIS16209_STAT_POWER_LOW_BIT 0 > > -#define ADIS16209_GLOB_CMD_REG 0x3E > -#define ADIS16209_GLOB_CMD_SW_RESET BIT(7) > -#define ADIS16209_GLOB_CMD_CLEAR_STAT BIT(4) > -#define ADIS16209_GLOB_CMD_FACTORY_CAL BIT(1) > +#define ADIS16209_CMD_REG 0x3E > +#define ADIS16209_CMD_SW_RESET BIT(7) > +#define ADIS16209_CMD_CLEAR_STAT BIT(4) > +#define ADIS16209_CMD_FACTORY_CAL BIT(1) > > #define ADIS16209_ERROR_ACTIVE BIT(14) > > @@ -238,29 +238,29 @@ static const struct iio_info adis16209_info = { > }; > > static const char * const adis16209_status_error_msgs[] = { > - [ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT] = "Self test failure", > - [ADIS16209_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure", > - [ADIS16209_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed", > - [ADIS16209_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V", > - [ADIS16209_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 3.15V", > + [ADIS16209_STAT_SELFTEST_FAIL_BIT] = "Self test failure", > + [ADIS16209_STAT_SPI_FAIL_BIT] = "SPI failure", > + [ADIS16209_STAT_FLASH_UPT_FAIL_BIT] = "Flash update failed", > + [ADIS16209_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V", > + [ADIS16209_STAT_POWER_LOW_BIT] = "Power supply below 3.15V", > }; > > static const struct adis_data adis16209_data = { > .read_delay = 30, > .msc_ctrl_reg = ADIS16209_MSC_CTRL_REG, > - .glob_cmd_reg = ADIS16209_GLOB_CMD_REG, > - .diag_stat_reg = ADIS16209_DIAG_STAT_REG, > + .glob_cmd_reg = ADIS16209_CMD_REG, > + .diag_stat_reg = ADIS16209_STAT_REG, > > .self_test_mask = ADIS16209_MSC_CTRL_SELF_TEST_EN, > .self_test_no_autoclear = true, > .startup_delay = ADIS16209_STARTUP_DELAY_MS, > > .status_error_msgs = adis16209_status_error_msgs, > - .status_error_mask = BIT(ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT) | > - BIT(ADIS16209_DIAG_STAT_SPI_FAIL_BIT) | > - BIT(ADIS16209_DIAG_STAT_FLASH_UPT_BIT) | > - BIT(ADIS16209_DIAG_STAT_POWER_HIGH_BIT) | > - BIT(ADIS16209_DIAG_STAT_POWER_LOW_BIT), > + .status_error_mask = BIT(ADIS16209_STAT_SELFTEST_FAIL_BIT) | > + BIT(ADIS16209_STAT_SPI_FAIL_BIT) | > + BIT(ADIS16209_STAT_FLASH_UPT_FAIL_BIT) | > + BIT(ADIS16209_STAT_POWER_HIGH_BIT) | > + BIT(ADIS16209_STAT_POWER_LOW_BIT), > }; > > static int adis16209_probe(struct spi_device *spi) -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/iio/accel/adis16209.c b/drivers/staging/iio/accel/adis16209.c index d8aef9c..eb5c878 100644 --- a/drivers/staging/iio/accel/adis16209.c +++ b/drivers/staging/iio/accel/adis16209.c @@ -68,21 +68,21 @@ #define ADIS16209_MSC_CTRL_ACTIVE_HIGH BIT(1) #define ADIS16209_MSC_CTRL_DATA_RDY_DIO2 BIT(0) -#define ADIS16209_DIAG_STAT_REG 0x3C -#define ADIS16209_DIAG_STAT_ALARM2 BIT(9) -#define ADIS16209_DIAG_STAT_ALARM1 BIT(8) -#define ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT 5 -#define ADIS16209_DIAG_STAT_SPI_FAIL_BIT 3 -#define ADIS16209_DIAG_STAT_FLASH_UPT_BIT 2 +#define ADIS16209_STAT_REG 0x3C +#define ADIS16209_STAT_ALARM2 BIT(9) +#define ADIS16209_STAT_ALARM1 BIT(8) +#define ADIS16209_STAT_SELFTEST_FAIL_BIT 5 +#define ADIS16209_STAT_SPI_FAIL_BIT 3 +#define ADIS16209_STAT_FLASH_UPT_FAIL_BIT 2 /* Power supply above 3.625 V */ -#define ADIS16209_DIAG_STAT_POWER_HIGH_BIT 1 +#define ADIS16209_STAT_POWER_HIGH_BIT 1 /* Power supply below 3.15 V */ -#define ADIS16209_DIAG_STAT_POWER_LOW_BIT 0 +#define ADIS16209_STAT_POWER_LOW_BIT 0 -#define ADIS16209_GLOB_CMD_REG 0x3E -#define ADIS16209_GLOB_CMD_SW_RESET BIT(7) -#define ADIS16209_GLOB_CMD_CLEAR_STAT BIT(4) -#define ADIS16209_GLOB_CMD_FACTORY_CAL BIT(1) +#define ADIS16209_CMD_REG 0x3E +#define ADIS16209_CMD_SW_RESET BIT(7) +#define ADIS16209_CMD_CLEAR_STAT BIT(4) +#define ADIS16209_CMD_FACTORY_CAL BIT(1) #define ADIS16209_ERROR_ACTIVE BIT(14) @@ -238,29 +238,29 @@ static const struct iio_info adis16209_info = { }; static const char * const adis16209_status_error_msgs[] = { - [ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT] = "Self test failure", - [ADIS16209_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure", - [ADIS16209_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed", - [ADIS16209_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V", - [ADIS16209_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 3.15V", + [ADIS16209_STAT_SELFTEST_FAIL_BIT] = "Self test failure", + [ADIS16209_STAT_SPI_FAIL_BIT] = "SPI failure", + [ADIS16209_STAT_FLASH_UPT_FAIL_BIT] = "Flash update failed", + [ADIS16209_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V", + [ADIS16209_STAT_POWER_LOW_BIT] = "Power supply below 3.15V", }; static const struct adis_data adis16209_data = { .read_delay = 30, .msc_ctrl_reg = ADIS16209_MSC_CTRL_REG, - .glob_cmd_reg = ADIS16209_GLOB_CMD_REG, - .diag_stat_reg = ADIS16209_DIAG_STAT_REG, + .glob_cmd_reg = ADIS16209_CMD_REG, + .diag_stat_reg = ADIS16209_STAT_REG, .self_test_mask = ADIS16209_MSC_CTRL_SELF_TEST_EN, .self_test_no_autoclear = true, .startup_delay = ADIS16209_STARTUP_DELAY_MS, .status_error_msgs = adis16209_status_error_msgs, - .status_error_mask = BIT(ADIS16209_DIAG_STAT_SELFTEST_FAIL_BIT) | - BIT(ADIS16209_DIAG_STAT_SPI_FAIL_BIT) | - BIT(ADIS16209_DIAG_STAT_FLASH_UPT_BIT) | - BIT(ADIS16209_DIAG_STAT_POWER_HIGH_BIT) | - BIT(ADIS16209_DIAG_STAT_POWER_LOW_BIT), + .status_error_mask = BIT(ADIS16209_STAT_SELFTEST_FAIL_BIT) | + BIT(ADIS16209_STAT_SPI_FAIL_BIT) | + BIT(ADIS16209_STAT_FLASH_UPT_FAIL_BIT) | + BIT(ADIS16209_STAT_POWER_HIGH_BIT) | + BIT(ADIS16209_STAT_POWER_LOW_BIT), }; static int adis16209_probe(struct spi_device *spi)
Make some of the macro names according to the names given in the datasheet of the adis16209 driver. Signed-off-by: Shreeya Patel <shreeya.patel23498@gmail.com> --- Changes in v3 -Introduce this new patch for v3 of the series. drivers/staging/iio/accel/adis16209.c | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-)