| Message ID | 20241024191200.229894-13-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: Clean up acpi_match_device() use cases | expand |
On Thu, 24 Oct 2024 22:05:01 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Move odr_start_up_times up in the code in a preparation of > the further cleaning up changes. > > While at it, make it clear what values from enum are being used for > the respective array entries. I did some cheeky white space additions in this one as well. Bit naughty in a code move patch, but I really want to get this stuff cleaned up across IIO and it seems silly to chase your series with another one changing the same code. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/iio/accel/kxcjk-1013.c | 154 ++++++++++++++++----------------- > 1 file changed, 77 insertions(+), 77 deletions(-) > > diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c > index 37c82fdf7c43..f384969a922d 100644 > --- a/drivers/iio/accel/kxcjk-1013.c > +++ b/drivers/iio/accel/kxcjk-1013.c > @@ -178,6 +178,83 @@ enum kx_chipset { > KX_MAX_CHIPS /* this must be last */ > }; > > +/* Refer to section 4 of the specification */ > +static const struct { > + int odr_bits; > + int usec; > +} odr_start_up_times[KX_MAX_CHIPS][12] = { > + /* KXCJK-1013 */ > + [KXCJK1013] = { > + {0x08, 100000}, > + {0x09, 100000}, > + {0x0A, 100000}, > + {0x0B, 100000}, > + {0, 80000}, I changed this to { 0x00, 80000 } as I think it helps readability to have them all aligned Spaces added to all entries. Jonathan > + {0x01, 41000}, > + {0x02, 21000}, > + {0x03, 11000}, > + {0x04, 6400}, > + {0x05, 3900}, > + {0x06, 2700}, > + {0x07, 2100}, > + }, > + /* KXCJ9-1008 */ > + [KXCJ91008] = { > + {0x08, 100000}, > + {0x09, 100000}, > + {0x0A, 100000}, > + {0x0B, 100000}, > + {0, 80000}, > + {0x01, 41000}, > + {0x02, 21000}, > + {0x03, 11000}, > + {0x04, 6400}, > + {0x05, 3900}, > + {0x06, 2700}, > + {0x07, 2100}, > + }, > + /* KXCTJ2-1009 */ > + [KXTJ21009] = { > + {0x08, 1240000}, > + {0x09, 621000}, > + {0x0A, 309000}, > + {0x0B, 151000}, > + {0, 80000}, > + {0x01, 41000}, > + {0x02, 21000}, > + {0x03, 11000}, > + {0x04, 6000}, > + {0x05, 4000}, > + {0x06, 3000}, > + {0x07, 2000}, > + }, > + /* KXTF9 */ > + [KXTF9] = { > + {0x01, 81000}, > + {0x02, 41000}, > + {0x03, 21000}, > + {0x04, 11000}, > + {0x05, 5100}, > + {0x06, 2700}, > + }, > + /* KX023-1025 */ > + [KX0231025] = { > + /* First 4 are not in datasheet, taken from KXCTJ2-1009 */ > + {0x08, 1240000}, > + {0x09, 621000}, > + {0x0A, 309000}, > + {0x0B, 151000}, > + {0, 81000}, > + {0x01, 40000}, > + {0x02, 22000}, > + {0x03, 12000}, > + {0x04, 7000}, > + {0x05, 4400}, > + {0x06, 3000}, > + {0x07, 3000}, > + }, > +}; > + > enum kx_acpi_type { > ACPI_GENERIC, > ACPI_SMO8500, > @@ -361,83 +438,6 @@ static const struct kx_odr_map kxtf9_samp_freq_table[] = { > static const char *const kxtf9_samp_freq_avail = > "25 50 100 200 400 800"; > > -/* Refer to section 4 of the specification */ > -static const struct { > - int odr_bits; > - int usec; > -} odr_start_up_times[KX_MAX_CHIPS][12] = { > - /* KXCJK-1013 */ > - { > - {0x08, 100000}, > - {0x09, 100000}, > - {0x0A, 100000}, > - {0x0B, 100000}, > - {0, 80000}, > - {0x01, 41000}, > - {0x02, 21000}, > - {0x03, 11000}, > - {0x04, 6400}, > - {0x05, 3900}, > - {0x06, 2700}, > - {0x07, 2100}, > - }, > - /* KXCJ9-1008 */ > - { > - {0x08, 100000}, > - {0x09, 100000}, > - {0x0A, 100000}, > - {0x0B, 100000}, > - {0, 80000}, > - {0x01, 41000}, > - {0x02, 21000}, > - {0x03, 11000}, > - {0x04, 6400}, > - {0x05, 3900}, > - {0x06, 2700}, > - {0x07, 2100}, > - }, > - /* KXCTJ2-1009 */ > - { > - {0x08, 1240000}, > - {0x09, 621000}, > - {0x0A, 309000}, > - {0x0B, 151000}, > - {0, 80000}, > - {0x01, 41000}, > - {0x02, 21000}, > - {0x03, 11000}, > - {0x04, 6000}, > - {0x05, 4000}, > - {0x06, 3000}, > - {0x07, 2000}, > - }, > - /* KXTF9 */ > - { > - {0x01, 81000}, > - {0x02, 41000}, > - {0x03, 21000}, > - {0x04, 11000}, > - {0x05, 5100}, > - {0x06, 2700}, > - }, > - /* KX023-1025 */ > - { > - /* First 4 are not in datasheet, taken from KXCTJ2-1009 */ > - {0x08, 1240000}, > - {0x09, 621000}, > - {0x0A, 309000}, > - {0x0B, 151000}, > - {0, 81000}, > - {0x01, 40000}, > - {0x02, 22000}, > - {0x03, 12000}, > - {0x04, 7000}, > - {0x05, 4400}, > - {0x06, 3000}, > - {0x07, 3000}, > - }, > -}; > - > static const struct { > u16 scale; > u8 gsel_0;
On Sat, Oct 26, 2024 at 12:30:12PM +0100, Jonathan Cameron wrote: > On Thu, 24 Oct 2024 22:05:01 +0300 > Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: ... > > While at it, make it clear what values from enum are being used for > > the respective array entries. > I did some cheeky white space additions in this one as well. > Bit naughty in a code move patch, but I really want to get this > stuff cleaned up across IIO and it seems silly to chase your series > with another one changing the same code. I like you change, thanks! ... > > + {0, 80000}, > I changed this to > { 0x00, 80000 } > as I think it helps readability to have them > all aligned > > Spaces added to all entries. Got it, please also add/fold the patch I sent today.
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index 37c82fdf7c43..f384969a922d 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -178,6 +178,83 @@ enum kx_chipset { KX_MAX_CHIPS /* this must be last */ }; +/* Refer to section 4 of the specification */ +static const struct { + int odr_bits; + int usec; +} odr_start_up_times[KX_MAX_CHIPS][12] = { + /* KXCJK-1013 */ + [KXCJK1013] = { + {0x08, 100000}, + {0x09, 100000}, + {0x0A, 100000}, + {0x0B, 100000}, + {0, 80000}, + {0x01, 41000}, + {0x02, 21000}, + {0x03, 11000}, + {0x04, 6400}, + {0x05, 3900}, + {0x06, 2700}, + {0x07, 2100}, + }, + /* KXCJ9-1008 */ + [KXCJ91008] = { + {0x08, 100000}, + {0x09, 100000}, + {0x0A, 100000}, + {0x0B, 100000}, + {0, 80000}, + {0x01, 41000}, + {0x02, 21000}, + {0x03, 11000}, + {0x04, 6400}, + {0x05, 3900}, + {0x06, 2700}, + {0x07, 2100}, + }, + /* KXCTJ2-1009 */ + [KXTJ21009] = { + {0x08, 1240000}, + {0x09, 621000}, + {0x0A, 309000}, + {0x0B, 151000}, + {0, 80000}, + {0x01, 41000}, + {0x02, 21000}, + {0x03, 11000}, + {0x04, 6000}, + {0x05, 4000}, + {0x06, 3000}, + {0x07, 2000}, + }, + /* KXTF9 */ + [KXTF9] = { + {0x01, 81000}, + {0x02, 41000}, + {0x03, 21000}, + {0x04, 11000}, + {0x05, 5100}, + {0x06, 2700}, + }, + /* KX023-1025 */ + [KX0231025] = { + /* First 4 are not in datasheet, taken from KXCTJ2-1009 */ + {0x08, 1240000}, + {0x09, 621000}, + {0x0A, 309000}, + {0x0B, 151000}, + {0, 81000}, + {0x01, 40000}, + {0x02, 22000}, + {0x03, 12000}, + {0x04, 7000}, + {0x05, 4400}, + {0x06, 3000}, + {0x07, 3000}, + }, +}; + enum kx_acpi_type { ACPI_GENERIC, ACPI_SMO8500, @@ -361,83 +438,6 @@ static const struct kx_odr_map kxtf9_samp_freq_table[] = { static const char *const kxtf9_samp_freq_avail = "25 50 100 200 400 800"; -/* Refer to section 4 of the specification */ -static const struct { - int odr_bits; - int usec; -} odr_start_up_times[KX_MAX_CHIPS][12] = { - /* KXCJK-1013 */ - { - {0x08, 100000}, - {0x09, 100000}, - {0x0A, 100000}, - {0x0B, 100000}, - {0, 80000}, - {0x01, 41000}, - {0x02, 21000}, - {0x03, 11000}, - {0x04, 6400}, - {0x05, 3900}, - {0x06, 2700}, - {0x07, 2100}, - }, - /* KXCJ9-1008 */ - { - {0x08, 100000}, - {0x09, 100000}, - {0x0A, 100000}, - {0x0B, 100000}, - {0, 80000}, - {0x01, 41000}, - {0x02, 21000}, - {0x03, 11000}, - {0x04, 6400}, - {0x05, 3900}, - {0x06, 2700}, - {0x07, 2100}, - }, - /* KXCTJ2-1009 */ - { - {0x08, 1240000}, - {0x09, 621000}, - {0x0A, 309000}, - {0x0B, 151000}, - {0, 80000}, - {0x01, 41000}, - {0x02, 21000}, - {0x03, 11000}, - {0x04, 6000}, - {0x05, 4000}, - {0x06, 3000}, - {0x07, 2000}, - }, - /* KXTF9 */ - { - {0x01, 81000}, - {0x02, 41000}, - {0x03, 21000}, - {0x04, 11000}, - {0x05, 5100}, - {0x06, 2700}, - }, - /* KX023-1025 */ - { - /* First 4 are not in datasheet, taken from KXCTJ2-1009 */ - {0x08, 1240000}, - {0x09, 621000}, - {0x0A, 309000}, - {0x0B, 151000}, - {0, 81000}, - {0x01, 40000}, - {0x02, 22000}, - {0x03, 12000}, - {0x04, 7000}, - {0x05, 4400}, - {0x06, 3000}, - {0x07, 3000}, - }, -}; - static const struct { u16 scale; u8 gsel_0;
Move odr_start_up_times up in the code in a preparation of the further cleaning up changes. While at it, make it clear what values from enum are being used for the respective array entries. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/iio/accel/kxcjk-1013.c | 154 ++++++++++++++++----------------- 1 file changed, 77 insertions(+), 77 deletions(-)