On Tue, 7 Jan 2020 13:17:05 +0200
Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> wrote:
> From: Nuno Sá <nuno.sa@xxxxxxxxxx>
>
> All timeouts are now handled by a dedicated timeout struct. This
> variable is no longer needed.
>
> Signed-off-by: Nuno Sá <nuno.sa@xxxxxxxxxx>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx>
Applied.
Thanks,
Jonathan
> ---
> drivers/iio/accel/adis16201.c | 1 -
> drivers/iio/accel/adis16209.c | 1 -
> drivers/iio/gyro/adis16136.c | 1 -
> drivers/iio/gyro/adis16260.c | 1 -
> drivers/iio/imu/adis16400.c | 1 -
> drivers/staging/iio/accel/adis16203.c | 1 -
> drivers/staging/iio/accel/adis16240.c | 1 -
> include/linux/iio/imu/adis.h | 1 -
> 8 files changed, 8 deletions(-)
>
> diff --git a/drivers/iio/accel/adis16201.c b/drivers/iio/accel/adis16201.c
> index c92d22387b01..0f0f27a8184e 100644
> --- a/drivers/iio/accel/adis16201.c
> +++ b/drivers/iio/accel/adis16201.c
> @@ -247,7 +247,6 @@ static const struct adis_data adis16201_data = {
>
> .self_test_mask = ADIS16201_MSC_CTRL_SELF_TEST_EN,
> .self_test_no_autoclear = true,
> - .startup_delay = ADIS16201_STARTUP_DELAY_MS,
> .timeouts = &adis16201_timeouts,
>
> .status_error_msgs = adis16201_status_error_msgs,
> diff --git a/drivers/iio/accel/adis16209.c b/drivers/iio/accel/adis16209.c
> index f5a78fc11919..c6dbd2424e10 100644
> --- a/drivers/iio/accel/adis16209.c
> +++ b/drivers/iio/accel/adis16209.c
> @@ -257,7 +257,6 @@ static const struct adis_data adis16209_data = {
>
> .self_test_mask = ADIS16209_MSC_CTRL_SELF_TEST_EN,
> .self_test_no_autoclear = true,
> - .startup_delay = ADIS16209_STARTUP_DELAY_MS,
> .timeouts = &adis16209_timeouts,
>
> .status_error_msgs = adis16209_status_error_msgs,
> diff --git a/drivers/iio/gyro/adis16136.c b/drivers/iio/gyro/adis16136.c
> index dc91d8df7697..d5e03a406d4a 100644
> --- a/drivers/iio/gyro/adis16136.c
> +++ b/drivers/iio/gyro/adis16136.c
> @@ -472,7 +472,6 @@ static const struct adis_data adis16136_data = {
> .msc_ctrl_reg = ADIS16136_REG_MSC_CTRL,
>
> .self_test_mask = ADIS16136_MSC_CTRL_SELF_TEST,
> - .startup_delay = 80,
>
> .read_delay = 10,
> .write_delay = 10,
> diff --git a/drivers/iio/gyro/adis16260.c b/drivers/iio/gyro/adis16260.c
> index 0e3a66a7726d..be09b3e5910c 100644
> --- a/drivers/iio/gyro/adis16260.c
> +++ b/drivers/iio/gyro/adis16260.c
> @@ -346,7 +346,6 @@ static const struct adis_data adis16260_data = {
> .diag_stat_reg = ADIS16260_DIAG_STAT,
>
> .self_test_mask = ADIS16260_MSC_CTRL_MEM_TEST,
> - .startup_delay = ADIS16260_STARTUP_DELAY,
> .timeouts = &adis16260_timeouts,
>
> .status_error_msgs = adis1620_status_error_msgs,
> diff --git a/drivers/iio/imu/adis16400.c b/drivers/iio/imu/adis16400.c
> index 51b1ec23b8ef..cfb1c19eb930 100644
> --- a/drivers/iio/imu/adis16400.c
> +++ b/drivers/iio/imu/adis16400.c
> @@ -1126,7 +1126,6 @@ static const struct adis_data adis16400_data = {
> .write_delay = 50,
>
> .self_test_mask = ADIS16400_MSC_CTRL_MEM_TEST,
> - .startup_delay = ADIS16400_STARTUP_DELAY,
>
> .status_error_msgs = adis16400_status_error_msgs,
> .status_error_mask = BIT(ADIS16400_DIAG_STAT_ZACCL_FAIL) |
> diff --git a/drivers/staging/iio/accel/adis16203.c b/drivers/staging/iio/accel/adis16203.c
> index 3d706ee02df0..39dfe3f7f254 100644
> --- a/drivers/staging/iio/accel/adis16203.c
> +++ b/drivers/staging/iio/accel/adis16203.c
> @@ -251,7 +251,6 @@ static const struct adis_data adis16203_data = {
>
> .self_test_mask = ADIS16203_MSC_CTRL_SELF_TEST_EN,
> .self_test_no_autoclear = true,
> - .startup_delay = ADIS16203_STARTUP_DELAY,
> .timeouts = &adis16203_timeouts,
>
> .status_error_msgs = adis16203_status_error_msgs,
> diff --git a/drivers/staging/iio/accel/adis16240.c b/drivers/staging/iio/accel/adis16240.c
> index d4848ef78c75..39eb8364aa95 100644
> --- a/drivers/staging/iio/accel/adis16240.c
> +++ b/drivers/staging/iio/accel/adis16240.c
> @@ -374,7 +374,6 @@ static const struct adis_data adis16240_data = {
>
> .self_test_mask = ADIS16240_MSC_CTRL_SELF_TEST_EN,
> .self_test_no_autoclear = true,
> - .startup_delay = ADIS16240_STARTUP_DELAY,
> .timeouts = &adis16240_timeouts,
>
> .status_error_msgs = adis16240_status_error_msgs,
> diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h
> index 853dc8c8365c..d2fcf45b4cef 100644
> --- a/include/linux/iio/imu/adis.h
> +++ b/include/linux/iio/imu/adis.h
> @@ -56,7 +56,6 @@ struct adis_data {
>
> unsigned int self_test_mask;
> bool self_test_no_autoclear;
> - unsigned int startup_delay;
> const struct adis_timeout *timeouts;
>
> const char * const *status_error_msgs;
