On 4/23/23 14:18, Jonathan Cameron wrote:
> On Mon, 17 Apr 2023 12:20:18 +0300
> Matti Vaittinen <mazziesaccount@xxxxxxxxx> wrote:
>
>> The IIO ABI mandates expressing integration times in seconds. The GTS
>> helper errorneously uses micro seconds in integration_times_available.
>> Fix this by converting the lists to IIO_VAL_INT_PLUS_MICRO.
>>
>> Signed-off-by: Matti Vaittinen <mazziesaccount@xxxxxxxxx>
>> ---
>> drivers/iio/industrialio-gts-helper.c | 43 ++++++++++++++++++++-------
>> 1 file changed, 33 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c
>> index 8bb68975b259..2ab8d2dce019 100644
>> --- a/drivers/iio/industrialio-gts-helper.c
>> +++ b/drivers/iio/industrialio-gts-helper.c
>> @@ -337,6 +337,17 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts)
>> return ret;
>> }
>>
>> +static void iio_gts_us_to_int_micro(int *time_us, int *int_micro_times,
>> + int num_times)
>> +{
>> + int i;
>> +
>> + for (i = 0; i < num_times; i++) {
>> + int_micro_times[i * 2] = time_us[i] / 1000000;
>> + int_micro_times[i * 2 + 1] = time_us[i] % 1000000;
>> + }
>> +}
>> +
>> /**
>> * iio_gts_build_avail_time_table - build table of available integration times
>> * @gts: Gain time scale descriptor
>> @@ -351,7 +362,7 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts)
>> */
>> static int iio_gts_build_avail_time_table(struct iio_gts *gts)
>> {
>> - int *times, i, j, idx = 0;
>> + int *times, i, j, idx = 0, *int_micro_times;
>>
>> if (!gts->num_itime)
>> return 0;
>> @@ -360,6 +371,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts)
>> if (!times)
>> return -ENOMEM;
>>
>> +
>
> Grumble.
Oh. I wonder how things like this tend to slip-in. Maybe I should change
my password, it must be someone else has cracked my it and is typing
these in at night while I am sleeping ^_^;
> If nothing else comes up I'll tidy that stray line up when applying.
Thanks!
> Note that these will need to wait for after rc1 now so my fixes branch
> has moved on to include the code being fixed.
Well, that's Ok. Please, let me know if you want me to rebase to rc1 and
respin the series.
--Matti
--
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland
~~ When things go utterly wrong vim users can always type :help! ~~
