* [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements
@ 2015-10-23 16:54 Alison Schofield
2015-10-25 2:33 ` [Outreachy kernel] " Greg KH
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Alison Schofield @ 2015-10-23 16:54 UTC (permalink / raw)
To: outreachy-kernel; +Cc: jic23, linux-iio
Cleanups related to the usage of dummy_scan_elements in the
iio dummy driver:
- change enum names to upper case INDEX_*
- use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value)
- comment edited to match changes & follow preferred kernel style
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
drivers/staging/iio/iio_simple_dummy.c | 22 ++++++++++++----------
drivers/staging/iio/iio_simple_dummy.h | 20 +++++++++++---------
drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++----
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c
index 381f90f..5e19068 100644
--- a/drivers/staging/iio/iio_simple_dummy.c
+++ b/drivers/staging/iio/iio_simple_dummy.c
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright (c) 2011 Jonathan Cameron
*
* This program is free software; you can redistribute it and/or modify it
@@ -137,7 +137,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = {
*/
.info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ),
/* The ordering of elements in the buffer via an enum */
- .scan_index = voltage0,
+ .scan_index = INDEX_VOLTAGE_0,
.scan_type = { /* Description of storage in buffer */
.sign = 'u', /* unsigned */
.realbits = 13, /* 13 bits */
@@ -176,7 +176,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = {
* sampling_frequency
* The frequency in Hz at which the channels are sampled
*/
- .scan_index = diffvoltage1m2,
+ .scan_index = INDEX_DIFFVOLTAGE_1M2,
.scan_type = { /* Description of storage in buffer */
.sign = 's', /* signed */
.realbits = 12, /* 12 bits */
@@ -194,7 +194,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = {
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
.info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ),
- .scan_index = diffvoltage3m4,
+ .scan_index = INDEX_DIFFVOLTAGE_3M4,
.scan_type = {
.sign = 's',
.realbits = 11,
@@ -221,7 +221,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = {
BIT(IIO_CHAN_INFO_CALIBSCALE) |
BIT(IIO_CHAN_INFO_CALIBBIAS),
.info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ),
- .scan_index = accelx,
+ .scan_index = INDEX_ACCELX,
.scan_type = { /* Description of storage in buffer */
.sign = 's', /* signed */
.realbits = 16, /* 16 bits */
@@ -230,10 +230,10 @@ static const struct iio_chan_spec iio_dummy_channels[] = {
},
},
/*
- * Convenience macro for timestamps. 4 is the index in
- * the buffer.
+ * Convenience macro for timestamps.
+ * INDEX_TIMESTAMP is the index in the buffer.
*/
- IIO_CHAN_SOFT_TIMESTAMP(4),
+ IIO_CHAN_SOFT_TIMESTAMP(INDEX_TIMESTAMP),
/* DAC channel out_voltage0_raw */
{
.type = IIO_VOLTAGE,
@@ -364,8 +364,10 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev,
ret = IIO_VAL_INT_PLUS_MICRO;
break;
case 1:
- /* all differential adc channels ->
- * 0.000001344 */
+ /*
+ * all differential adc
+ * channels -> 0.000001344
+ */
*val = 0;
*val2 = 1344;
ret = IIO_VAL_INT_PLUS_NANO;
diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h
index 5c2f4d0..31b62ad 100644
--- a/drivers/staging/iio/iio_simple_dummy.h
+++ b/drivers/staging/iio/iio_simple_dummy.h
@@ -96,20 +96,22 @@ iio_simple_dummy_events_unregister(struct iio_dev *indio_dev)
#endif /* CONFIG_IIO_SIMPLE_DUMMY_EVENTS*/
-/**
+/*
* enum iio_simple_dummy_scan_elements - scan index enum
- * @voltage0: the single ended voltage channel
- * @diffvoltage1m2: first differential channel
- * @diffvoltage3m4: second differenial channel
- * @accelx: acceleration channel
+ * @INDEX_VOLTAGE_0: the single ended voltage channel
+ * @INDEX_DIFFVOLTAGE_1M2: first differential channel
+ * @INDEX_DIFFVOLTAGE_3M4: second differential channel
+ * @INDEX_ACCELX: acceleration channel
+ * @INDEX_TIMESTAMP: timestamp channel
*
* Enum provides convenient numbering for the scan index.
*/
enum iio_simple_dummy_scan_elements {
- voltage0,
- diffvoltage1m2,
- diffvoltage3m4,
- accelx,
+ INDEX_VOLTAGE_0,
+ INDEX_DIFFVOLTAGE_1M2,
+ INDEX_DIFFVOLTAGE_3M4,
+ INDEX_ACCELX,
+ INDEX_TIMESTAMP,
};
#ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER
diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index 00ed774..7516835 100644
--- a/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -27,10 +27,11 @@
/* Some fake data */
static const s16 fakedata[] = {
- [voltage0] = 7,
- [diffvoltage1m2] = -33,
- [diffvoltage3m4] = -2,
- [accelx] = 344,
+ [INDEX_VOLTAGE_0] = 7,
+ [INDEX_DIFFVOLTAGE_1M2] = -33,
+ [INDEX_DIFFVOLTAGE_3M4] = -2,
+ [INDEX_ACCELX] = 344,
+ [INDEX_TIMESTAMP] = 50,
};
/**
--
2.1.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [Outreachy kernel] [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements 2015-10-23 16:54 [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements Alison Schofield @ 2015-10-25 2:33 ` Greg KH 2015-10-25 10:54 ` Jonathan Cameron ` (2 subsequent siblings) 3 siblings, 0 replies; 13+ messages in thread From: Greg KH @ 2015-10-25 2:33 UTC (permalink / raw) To: Alison Schofield; +Cc: outreachy-kernel, jic23, linux-iio On Fri, Oct 23, 2015 at 09:54:27AM -0700, Alison Schofield wrote: > Cleanups related to the usage of dummy_scan_elements in the > iio dummy driver: > - change enum names to upper case INDEX_* > - use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value) > - comment edited to match changes & follow preferred kernel style That's 3 different things, so this should be 3 different patches, right? Please break it up and resend. thanks, greg k-h ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements 2015-10-23 16:54 [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements Alison Schofield 2015-10-25 2:33 ` [Outreachy kernel] " Greg KH @ 2015-10-25 10:54 ` Jonathan Cameron 2015-10-26 3:29 ` Alison Schofield 2015-10-26 8:11 ` Daniel Baluta 2015-10-26 20:46 ` [PATCH 0/3] iio: dummy: scan index enum update and clean up Alison Schofield 3 siblings, 1 reply; 13+ messages in thread From: Jonathan Cameron @ 2015-10-25 10:54 UTC (permalink / raw) To: Alison Schofield, outreachy-kernel; +Cc: linux-iio On 23/10/15 17:54, Alison Schofield wrote: > Cleanups related to the usage of dummy_scan_elements in the > iio dummy driver: > - change enum names to upper case INDEX_* > - use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value) > - comment edited to match changes & follow preferred kernel style > As Greg observed this would be better as three separate patches. Comment inline as well. Jonathan > Signed-off-by: Alison Schofield <amsfield22@gmail.com> > --- > drivers/staging/iio/iio_simple_dummy.c | 22 ++++++++++++---------- > drivers/staging/iio/iio_simple_dummy.h | 20 +++++++++++--------- > drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++---- > 3 files changed, 28 insertions(+), 23 deletions(-) > > diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c > index 381f90f..5e19068 100644 > --- a/drivers/staging/iio/iio_simple_dummy.c > +++ b/drivers/staging/iio/iio_simple_dummy.c > @@ -1,4 +1,4 @@ > -/** > +/* > * Copyright (c) 2011 Jonathan Cameron > * > * This program is free software; you can redistribute it and/or modify it > @@ -137,7 +137,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > */ > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > /* The ordering of elements in the buffer via an enum */ > - .scan_index = voltage0, > + .scan_index = INDEX_VOLTAGE_0, > .scan_type = { /* Description of storage in buffer */ > .sign = 'u', /* unsigned */ > .realbits = 13, /* 13 bits */ > @@ -176,7 +176,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > * sampling_frequency > * The frequency in Hz at which the channels are sampled > */ > - .scan_index = diffvoltage1m2, > + .scan_index = INDEX_DIFFVOLTAGE_1M2, > .scan_type = { /* Description of storage in buffer */ > .sign = 's', /* signed */ > .realbits = 12, /* 12 bits */ > @@ -194,7 +194,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > - .scan_index = diffvoltage3m4, > + .scan_index = INDEX_DIFFVOLTAGE_3M4, > .scan_type = { > .sign = 's', > .realbits = 11, > @@ -221,7 +221,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > BIT(IIO_CHAN_INFO_CALIBSCALE) | > BIT(IIO_CHAN_INFO_CALIBBIAS), > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > - .scan_index = accelx, > + .scan_index = INDEX_ACCELX, > .scan_type = { /* Description of storage in buffer */ > .sign = 's', /* signed */ > .realbits = 16, /* 16 bits */ > @@ -230,10 +230,10 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > }, > }, > /* > - * Convenience macro for timestamps. 4 is the index in > - * the buffer. > + * Convenience macro for timestamps. > + * INDEX_TIMESTAMP is the index in the buffer. > */ > - IIO_CHAN_SOFT_TIMESTAMP(4), > + IIO_CHAN_SOFT_TIMESTAMP(INDEX_TIMESTAMP), > /* DAC channel out_voltage0_raw */ > { > .type = IIO_VOLTAGE, > @@ -364,8 +364,10 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev, > ret = IIO_VAL_INT_PLUS_MICRO; > break; > case 1: > - /* all differential adc channels -> > - * 0.000001344 */ > + /* > + * all differential adc > + * channels -> 0.000001344 > + */ > *val = 0; > *val2 = 1344; > ret = IIO_VAL_INT_PLUS_NANO; > diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h > index 5c2f4d0..31b62ad 100644 > --- a/drivers/staging/iio/iio_simple_dummy.h > +++ b/drivers/staging/iio/iio_simple_dummy.h > @@ -96,20 +96,22 @@ iio_simple_dummy_events_unregister(struct iio_dev *indio_dev) > > #endif /* CONFIG_IIO_SIMPLE_DUMMY_EVENTS*/ > > -/** > +/* > * enum iio_simple_dummy_scan_elements - scan index enum > - * @voltage0: the single ended voltage channel > - * @diffvoltage1m2: first differential channel > - * @diffvoltage3m4: second differenial channel > - * @accelx: acceleration channel > + * @INDEX_VOLTAGE_0: the single ended voltage channel > + * @INDEX_DIFFVOLTAGE_1M2: first differential channel > + * @INDEX_DIFFVOLTAGE_3M4: second differential channel > + * @INDEX_ACCELX: acceleration channel > + * @INDEX_TIMESTAMP: timestamp channel > * > * Enum provides convenient numbering for the scan index. > */ > enum iio_simple_dummy_scan_elements { > - voltage0, > - diffvoltage1m2, > - diffvoltage3m4, > - accelx, > + INDEX_VOLTAGE_0, Even better would be to prefix these to make it clear they are driver specific. With such generic names one might suspect they come from somewhere in the core. Perhaps DUMMY_INDEX_... ? > + INDEX_DIFFVOLTAGE_1M2, > + INDEX_DIFFVOLTAGE_3M4, > + INDEX_ACCELX, > + INDEX_TIMESTAMP, > }; > > #ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER > diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c > index 00ed774..7516835 100644 > --- a/drivers/staging/iio/iio_simple_dummy_buffer.c > +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c > @@ -27,10 +27,11 @@ > /* Some fake data */ > > static const s16 fakedata[] = { > - [voltage0] = 7, > - [diffvoltage1m2] = -33, > - [diffvoltage3m4] = -2, > - [accelx] = 344, > + [INDEX_VOLTAGE_0] = 7, > + [INDEX_DIFFVOLTAGE_1M2] = -33, > + [INDEX_DIFFVOLTAGE_3M4] = -2, > + [INDEX_ACCELX] = 344, > + [INDEX_TIMESTAMP] = 50, > }; > > /** > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements 2015-10-25 10:54 ` Jonathan Cameron @ 2015-10-26 3:29 ` Alison Schofield 2015-10-26 7:21 ` Jonathan Cameron 0 siblings, 1 reply; 13+ messages in thread From: Alison Schofield @ 2015-10-26 3:29 UTC (permalink / raw) To: Jonathan Cameron, gregkh; +Cc: outreachy-kernel, linux-iio On Sun, Oct 25, 2015 at 10:54:29AM +0000, Jonathan Cameron wrote: > On 23/10/15 17:54, Alison Schofield wrote: > > Cleanups related to the usage of dummy_scan_elements in the > > iio dummy driver: > > - change enum names to upper case INDEX_* > > - use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value) > > - comment edited to match changes & follow preferred kernel style > > > As Greg observed this would be better as three separate patches. > Comment inline as well. > > Jonathan Greg, Jonathan, Thanks for the review. I understand it needs to be a set. I only see 2 patches: 1) change enum names to be upper case. 2) replace hardcoded scan_index in IIO_CHAN_SOFT_TIMESTAMP I don't see the comments as a 3rd, they go with each change. ie. when I change the enum names, I update the comments right above it to match. Same with Patch 2. OK? alison > > Signed-off-by: Alison Schofield <amsfield22@gmail.com> > > --- > > drivers/staging/iio/iio_simple_dummy.c | 22 ++++++++++++---------- > > drivers/staging/iio/iio_simple_dummy.h | 20 +++++++++++--------- > > drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++---- > > 3 files changed, 28 insertions(+), 23 deletions(-) > > > > diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c > > index 381f90f..5e19068 100644 > > --- a/drivers/staging/iio/iio_simple_dummy.c > > +++ b/drivers/staging/iio/iio_simple_dummy.c > > @@ -1,4 +1,4 @@ > > -/** > > +/* > > * Copyright (c) 2011 Jonathan Cameron > > * > > * This program is free software; you can redistribute it and/or modify it > > @@ -137,7 +137,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > > */ > > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > > /* The ordering of elements in the buffer via an enum */ > > - .scan_index = voltage0, > > + .scan_index = INDEX_VOLTAGE_0, > > .scan_type = { /* Description of storage in buffer */ > > .sign = 'u', /* unsigned */ > > .realbits = 13, /* 13 bits */ > > @@ -176,7 +176,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > > * sampling_frequency > > * The frequency in Hz at which the channels are sampled > > */ > > - .scan_index = diffvoltage1m2, > > + .scan_index = INDEX_DIFFVOLTAGE_1M2, > > .scan_type = { /* Description of storage in buffer */ > > .sign = 's', /* signed */ > > .realbits = 12, /* 12 bits */ > > @@ -194,7 +194,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > > .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > > .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > > - .scan_index = diffvoltage3m4, > > + .scan_index = INDEX_DIFFVOLTAGE_3M4, > > .scan_type = { > > .sign = 's', > > .realbits = 11, > > @@ -221,7 +221,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > > BIT(IIO_CHAN_INFO_CALIBSCALE) | > > BIT(IIO_CHAN_INFO_CALIBBIAS), > > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > > - .scan_index = accelx, > > + .scan_index = INDEX_ACCELX, > > .scan_type = { /* Description of storage in buffer */ > > .sign = 's', /* signed */ > > .realbits = 16, /* 16 bits */ > > @@ -230,10 +230,10 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > > }, > > }, > > /* > > - * Convenience macro for timestamps. 4 is the index in > > - * the buffer. > > + * Convenience macro for timestamps. > > + * INDEX_TIMESTAMP is the index in the buffer. > > */ > > - IIO_CHAN_SOFT_TIMESTAMP(4), > > + IIO_CHAN_SOFT_TIMESTAMP(INDEX_TIMESTAMP), > > /* DAC channel out_voltage0_raw */ > > { > > .type = IIO_VOLTAGE, > > @@ -364,8 +364,10 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev, > > ret = IIO_VAL_INT_PLUS_MICRO; > > break; > > case 1: > > - /* all differential adc channels -> > > - * 0.000001344 */ > > + /* > > + * all differential adc > > + * channels -> 0.000001344 > > + */ > > *val = 0; > > *val2 = 1344; > > ret = IIO_VAL_INT_PLUS_NANO; > > diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h > > index 5c2f4d0..31b62ad 100644 > > --- a/drivers/staging/iio/iio_simple_dummy.h > > +++ b/drivers/staging/iio/iio_simple_dummy.h > > @@ -96,20 +96,22 @@ iio_simple_dummy_events_unregister(struct iio_dev *indio_dev) > > > > #endif /* CONFIG_IIO_SIMPLE_DUMMY_EVENTS*/ > > > > -/** > > +/* > > * enum iio_simple_dummy_scan_elements - scan index enum > > - * @voltage0: the single ended voltage channel > > - * @diffvoltage1m2: first differential channel > > - * @diffvoltage3m4: second differenial channel > > - * @accelx: acceleration channel > > + * @INDEX_VOLTAGE_0: the single ended voltage channel > > + * @INDEX_DIFFVOLTAGE_1M2: first differential channel > > + * @INDEX_DIFFVOLTAGE_3M4: second differential channel > > + * @INDEX_ACCELX: acceleration channel > > + * @INDEX_TIMESTAMP: timestamp channel > > * > > * Enum provides convenient numbering for the scan index. > > */ > > enum iio_simple_dummy_scan_elements { > > - voltage0, > > - diffvoltage1m2, > > - diffvoltage3m4, > > - accelx, > > + INDEX_VOLTAGE_0, > Even better would be to prefix these to make it clear they > are driver specific. With such generic names one might > suspect they come from somewhere in the core. > > Perhaps > DUMMY_INDEX_... > ? > > + INDEX_DIFFVOLTAGE_1M2, > > + INDEX_DIFFVOLTAGE_3M4, > > + INDEX_ACCELX, > > + INDEX_TIMESTAMP, > > }; > > > > #ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER > > diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c > > index 00ed774..7516835 100644 > > --- a/drivers/staging/iio/iio_simple_dummy_buffer.c > > +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c > > @@ -27,10 +27,11 @@ > > /* Some fake data */ > > > > static const s16 fakedata[] = { > > - [voltage0] = 7, > > - [diffvoltage1m2] = -33, > > - [diffvoltage3m4] = -2, > > - [accelx] = 344, > > + [INDEX_VOLTAGE_0] = 7, > > + [INDEX_DIFFVOLTAGE_1M2] = -33, > > + [INDEX_DIFFVOLTAGE_3M4] = -2, > > + [INDEX_ACCELX] = 344, > > + [INDEX_TIMESTAMP] = 50, > > }; > > > > /** > > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements 2015-10-26 3:29 ` Alison Schofield @ 2015-10-26 7:21 ` Jonathan Cameron 0 siblings, 0 replies; 13+ messages in thread From: Jonathan Cameron @ 2015-10-26 7:21 UTC (permalink / raw) To: Alison Schofield, Jonathan Cameron, gregkh; +Cc: outreachy-kernel, linux-iio On 26 October 2015 03:29:46 GMT+00:00, Alison Schofield <amsfield22@gmail.com> wrote: >On Sun, Oct 25, 2015 at 10:54:29AM +0000, Jonathan Cameron wrote: >> On 23/10/15 17:54, Alison Schofield wrote: >> > Cleanups related to the usage of dummy_scan_elements in the >> > iio dummy driver: >> > - change enum names to upper case INDEX_* >> > - use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value) >> > - comment edited to match changes & follow preferred kernel style >> > >> As Greg observed this would be better as three separate patches. >> Comment inline as well. >> >> Jonathan > >Greg, Jonathan, > >Thanks for the review. I understand it needs to be a set. > >I only see 2 patches: >1) change enum names to be upper case. >2) replace hardcoded scan_index in IIO_CHAN_SOFT_TIMESTAMP > >I don't see the comments as a 3rd, they go with each change. >ie. when I change the enum names, I update the comments >right above it to match. Same with Patch 2. > >OK? There are a few other comment syntax changes that should really be in a third patch, trivial though they are. > >alison > >> > Signed-off-by: Alison Schofield <amsfield22@gmail.com> >> > --- >> > drivers/staging/iio/iio_simple_dummy.c | 22 >++++++++++++---------- >> > drivers/staging/iio/iio_simple_dummy.h | 20 >+++++++++++--------- >> > drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++---- >> > 3 files changed, 28 insertions(+), 23 deletions(-) >> > >> > diff --git a/drivers/staging/iio/iio_simple_dummy.c >b/drivers/staging/iio/iio_simple_dummy.c >> > index 381f90f..5e19068 100644 >> > --- a/drivers/staging/iio/iio_simple_dummy.c >> > +++ b/drivers/staging/iio/iio_simple_dummy.c >> > @@ -1,4 +1,4 @@ >> > -/** >> > +/* >> > * Copyright (c) 2011 Jonathan Cameron >> > * >> > * This program is free software; you can redistribute it and/or >modify it >> > @@ -137,7 +137,7 @@ static const struct iio_chan_spec >iio_dummy_channels[] = { >> > */ >> > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), >> > /* The ordering of elements in the buffer via an enum */ >> > - .scan_index = voltage0, >> > + .scan_index = INDEX_VOLTAGE_0, >> > .scan_type = { /* Description of storage in buffer */ >> > .sign = 'u', /* unsigned */ >> > .realbits = 13, /* 13 bits */ >> > @@ -176,7 +176,7 @@ static const struct iio_chan_spec >iio_dummy_channels[] = { >> > * sampling_frequency >> > * The frequency in Hz at which the channels are sampled >> > */ >> > - .scan_index = diffvoltage1m2, >> > + .scan_index = INDEX_DIFFVOLTAGE_1M2, >> > .scan_type = { /* Description of storage in buffer */ >> > .sign = 's', /* signed */ >> > .realbits = 12, /* 12 bits */ >> > @@ -194,7 +194,7 @@ static const struct iio_chan_spec >iio_dummy_channels[] = { >> > .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), >> > .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), >> > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), >> > - .scan_index = diffvoltage3m4, >> > + .scan_index = INDEX_DIFFVOLTAGE_3M4, >> > .scan_type = { >> > .sign = 's', >> > .realbits = 11, >> > @@ -221,7 +221,7 @@ static const struct iio_chan_spec >iio_dummy_channels[] = { >> > BIT(IIO_CHAN_INFO_CALIBSCALE) | >> > BIT(IIO_CHAN_INFO_CALIBBIAS), >> > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), >> > - .scan_index = accelx, >> > + .scan_index = INDEX_ACCELX, >> > .scan_type = { /* Description of storage in buffer */ >> > .sign = 's', /* signed */ >> > .realbits = 16, /* 16 bits */ >> > @@ -230,10 +230,10 @@ static const struct iio_chan_spec >iio_dummy_channels[] = { >> > }, >> > }, >> > /* >> > - * Convenience macro for timestamps. 4 is the index in >> > - * the buffer. >> > + * Convenience macro for timestamps. >> > + * INDEX_TIMESTAMP is the index in the buffer. >> > */ >> > - IIO_CHAN_SOFT_TIMESTAMP(4), >> > + IIO_CHAN_SOFT_TIMESTAMP(INDEX_TIMESTAMP), >> > /* DAC channel out_voltage0_raw */ >> > { >> > .type = IIO_VOLTAGE, >> > @@ -364,8 +364,10 @@ static int iio_dummy_read_raw(struct iio_dev >*indio_dev, >> > ret = IIO_VAL_INT_PLUS_MICRO; >> > break; >> > case 1: >> > - /* all differential adc channels -> >> > - * 0.000001344 */ >> > + /* >> > + * all differential adc >> > + * channels -> 0.000001344 >> > + */ >> > *val = 0; >> > *val2 = 1344; >> > ret = IIO_VAL_INT_PLUS_NANO; >> > diff --git a/drivers/staging/iio/iio_simple_dummy.h >b/drivers/staging/iio/iio_simple_dummy.h >> > index 5c2f4d0..31b62ad 100644 >> > --- a/drivers/staging/iio/iio_simple_dummy.h >> > +++ b/drivers/staging/iio/iio_simple_dummy.h >> > @@ -96,20 +96,22 @@ iio_simple_dummy_events_unregister(struct >iio_dev *indio_dev) >> > >> > #endif /* CONFIG_IIO_SIMPLE_DUMMY_EVENTS*/ >> > >> > -/** >> > +/* >> > * enum iio_simple_dummy_scan_elements - scan index enum >> > - * @voltage0: the single ended voltage channel >> > - * @diffvoltage1m2: first differential channel >> > - * @diffvoltage3m4: second differenial channel >> > - * @accelx: acceleration channel >> > + * @INDEX_VOLTAGE_0: the single ended voltage channel >> > + * @INDEX_DIFFVOLTAGE_1M2: first differential channel >> > + * @INDEX_DIFFVOLTAGE_3M4: second differential channel >> > + * @INDEX_ACCELX: acceleration channel >> > + * @INDEX_TIMESTAMP: timestamp channel >> > * >> > * Enum provides convenient numbering for the scan index. >> > */ >> > enum iio_simple_dummy_scan_elements { >> > - voltage0, >> > - diffvoltage1m2, >> > - diffvoltage3m4, >> > - accelx, >> > + INDEX_VOLTAGE_0, >> Even better would be to prefix these to make it clear they >> are driver specific. With such generic names one might >> suspect they come from somewhere in the core. >> >> Perhaps >> DUMMY_INDEX_... >> ? >> > + INDEX_DIFFVOLTAGE_1M2, >> > + INDEX_DIFFVOLTAGE_3M4, >> > + INDEX_ACCELX, >> > + INDEX_TIMESTAMP, >> > }; >> > >> > #ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER >> > diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c >b/drivers/staging/iio/iio_simple_dummy_buffer.c >> > index 00ed774..7516835 100644 >> > --- a/drivers/staging/iio/iio_simple_dummy_buffer.c >> > +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c >> > @@ -27,10 +27,11 @@ >> > /* Some fake data */ >> > >> > static const s16 fakedata[] = { >> > - [voltage0] = 7, >> > - [diffvoltage1m2] = -33, >> > - [diffvoltage3m4] = -2, >> > - [accelx] = 344, >> > + [INDEX_VOLTAGE_0] = 7, >> > + [INDEX_DIFFVOLTAGE_1M2] = -33, >> > + [INDEX_DIFFVOLTAGE_3M4] = -2, >> > + [INDEX_ACCELX] = 344, >> > + [INDEX_TIMESTAMP] = 50, >> > }; >> > >> > /** >> > >> -- Sent from my Android device with K-9 Mail. Please excuse my brevity. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements 2015-10-23 16:54 [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements Alison Schofield 2015-10-25 2:33 ` [Outreachy kernel] " Greg KH 2015-10-25 10:54 ` Jonathan Cameron @ 2015-10-26 8:11 ` Daniel Baluta 2015-10-26 17:20 ` Alison Schofield 2015-10-26 20:46 ` [PATCH 0/3] iio: dummy: scan index enum update and clean up Alison Schofield 3 siblings, 1 reply; 13+ messages in thread From: Daniel Baluta @ 2015-10-26 8:11 UTC (permalink / raw) To: Alison Schofield, outreachy-kernel; +Cc: jic23, linux-iio On 10/23/2015 07:54 PM, Alison Schofield wrote: > Cleanups related to the usage of dummy_scan_elements in the > iio dummy driver: > - change enum names to upper case INDEX_* > - use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value) > - comment edited to match changes & follow preferred kernel style > > Signed-off-by: Alison Schofield <amsfield22@gmail.com> > --- > drivers/staging/iio/iio_simple_dummy.c | 22 ++++++++++++---------- > drivers/staging/iio/iio_simple_dummy.h | 20 +++++++++++--------- > drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++---- > 3 files changed, 28 insertions(+), 23 deletions(-) > > diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c > index 381f90f..5e19068 100644 > --- a/drivers/staging/iio/iio_simple_dummy.c > +++ b/drivers/staging/iio/iio_simple_dummy.c > @@ -1,4 +1,4 @@ > -/** > +/* This change should be in the 3rd patch. > * Copyright (c) 2011 Jonathan Cameron > * > * This program is free software; you can redistribute it and/or modify it > @@ -137,7 +137,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > */ > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > /* The ordering of elements in the buffer via an enum */ > - .scan_index = voltage0, > + .scan_index = INDEX_VOLTAGE_0, > .scan_type = { /* Description of storage in buffer */ > .sign = 'u', /* unsigned */ > .realbits = 13, /* 13 bits */ > @@ -176,7 +176,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > * sampling_frequency > * The frequency in Hz at which the channels are sampled > */ > - .scan_index = diffvoltage1m2, > + .scan_index = INDEX_DIFFVOLTAGE_1M2, > .scan_type = { /* Description of storage in buffer */ > .sign = 's', /* signed */ > .realbits = 12, /* 12 bits */ > @@ -194,7 +194,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > - .scan_index = diffvoltage3m4, > + .scan_index = INDEX_DIFFVOLTAGE_3M4, > .scan_type = { > .sign = 's', > .realbits = 11, > @@ -221,7 +221,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > BIT(IIO_CHAN_INFO_CALIBSCALE) | > BIT(IIO_CHAN_INFO_CALIBBIAS), > .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), > - .scan_index = accelx, > + .scan_index = INDEX_ACCELX, > .scan_type = { /* Description of storage in buffer */ > .sign = 's', /* signed */ > .realbits = 16, /* 16 bits */ > @@ -230,10 +230,10 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > }, > }, > /* > - * Convenience macro for timestamps. 4 is the index in > - * the buffer. > + * Convenience macro for timestamps. > + * INDEX_TIMESTAMP is the index in the buffer. > */ > - IIO_CHAN_SOFT_TIMESTAMP(4), > + IIO_CHAN_SOFT_TIMESTAMP(INDEX_TIMESTAMP), > /* DAC channel out_voltage0_raw */ > { > .type = IIO_VOLTAGE, > @@ -364,8 +364,10 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev, > ret = IIO_VAL_INT_PLUS_MICRO; > break; > case 1: > - /* all differential adc channels -> > - * 0.000001344 */ > + /* > + * all differential adc > + * channels -> 0.000001344 > + */ Also this one. Could this be a one line comment? > *val = 0; > *val2 = 1344; > ret = IIO_VAL_INT_PLUS_NANO; > diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h > index 5c2f4d0..31b62ad 100644 > --- a/drivers/staging/iio/iio_simple_dummy.h > +++ b/drivers/staging/iio/iio_simple_dummy.h > @@ -96,20 +96,22 @@ iio_simple_dummy_events_unregister(struct iio_dev *indio_dev) > > #endif /* CONFIG_IIO_SIMPLE_DUMMY_EVENTS*/ > > -/** > +/* > * enum iio_simple_dummy_scan_elements - scan index enum > - * @voltage0: the single ended voltage channel > - * @diffvoltage1m2: first differential channel > - * @diffvoltage3m4: second differenial channel > - * @accelx: acceleration channel > + * @INDEX_VOLTAGE_0: the single ended voltage channel > + * @INDEX_DIFFVOLTAGE_1M2: first differential channel > + * @INDEX_DIFFVOLTAGE_3M4: second differential channel > + * @INDEX_ACCELX: acceleration channel > + * @INDEX_TIMESTAMP: timestamp channel > * > * Enum provides convenient numbering for the scan index. > */ > enum iio_simple_dummy_scan_elements { > - voltage0, > - diffvoltage1m2, > - diffvoltage3m4, > - accelx, > + INDEX_VOLTAGE_0, > + INDEX_DIFFVOLTAGE_1M2, > + INDEX_DIFFVOLTAGE_3M4, > + INDEX_ACCELX, > + INDEX_TIMESTAMP, > }; > > #ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER > diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c > index 00ed774..7516835 100644 > --- a/drivers/staging/iio/iio_simple_dummy_buffer.c > +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c > @@ -27,10 +27,11 @@ > /* Some fake data */ > > static const s16 fakedata[] = { > - [voltage0] = 7, > - [diffvoltage1m2] = -33, > - [diffvoltage3m4] = -2, > - [accelx] = 344, > + [INDEX_VOLTAGE_0] = 7, > + [INDEX_DIFFVOLTAGE_1M2] = -33, > + [INDEX_DIFFVOLTAGE_3M4] = -2, > + [INDEX_ACCELX] = 344, > + [INDEX_TIMESTAMP] = 50, > }; > > /** > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements 2015-10-26 8:11 ` Daniel Baluta @ 2015-10-26 17:20 ` Alison Schofield 2015-10-26 17:32 ` Jonathan Cameron 0 siblings, 1 reply; 13+ messages in thread From: Alison Schofield @ 2015-10-26 17:20 UTC (permalink / raw) To: Daniel Baluta; +Cc: outreachy-kernel, jic23, linux-iio On Mon, Oct 26, 2015 at 10:11:05AM +0200, Daniel Baluta wrote: > > > On 10/23/2015 07:54 PM, Alison Schofield wrote: > >Cleanups related to the usage of dummy_scan_elements in the > >iio dummy driver: > >- change enum names to upper case INDEX_* > >- use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value) > >- comment edited to match changes & follow preferred kernel style > > > >Signed-off-by: Alison Schofield <amsfield22@gmail.com> > >--- > > drivers/staging/iio/iio_simple_dummy.c | 22 ++++++++++++---------- > > drivers/staging/iio/iio_simple_dummy.h | 20 +++++++++++--------- > > drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++---- > > 3 files changed, 28 insertions(+), 23 deletions(-) > > > >diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c > >index 381f90f..5e19068 100644 > >--- a/drivers/staging/iio/iio_simple_dummy.c > >+++ b/drivers/staging/iio/iio_simple_dummy.c > >@@ -1,4 +1,4 @@ > >-/** > >+/* > This change should be in the 3rd patch. > Thanks for the eagle eyes! I see this (and the other comment I edit'd also.) It leads to another question. In these dummy files, there are 27 comment blocks that start with /** instead of /* . I touched 2 of them as a passerby, but now that I'm looking.... should I change them all or is /** that an acceptable variation. alison < snip > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements 2015-10-26 17:20 ` Alison Schofield @ 2015-10-26 17:32 ` Jonathan Cameron 0 siblings, 0 replies; 13+ messages in thread From: Jonathan Cameron @ 2015-10-26 17:32 UTC (permalink / raw) To: Alison Schofield, Daniel Baluta; +Cc: outreachy-kernel, jic23, linux-iio On 26 October 2015 17:20:46 GMT+00:00, Alison Schofield <amsfield22@gmail.com> wrote: >On Mon, Oct 26, 2015 at 10:11:05AM +0200, Daniel Baluta wrote: >> >> >> On 10/23/2015 07:54 PM, Alison Schofield wrote: >> >Cleanups related to the usage of dummy_scan_elements in the >> >iio dummy driver: >> >- change enum names to upper case INDEX_* >> >- use the enum for IIO_CHAN_SOFT_TIMESTAMP (rm hard coded value) >> >- comment edited to match changes & follow preferred kernel style >> > >> >Signed-off-by: Alison Schofield <amsfield22@gmail.com> >> >--- >> > drivers/staging/iio/iio_simple_dummy.c | 22 >++++++++++++---------- >> > drivers/staging/iio/iio_simple_dummy.h | 20 >+++++++++++--------- >> > drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++---- >> > 3 files changed, 28 insertions(+), 23 deletions(-) >> > >> >diff --git a/drivers/staging/iio/iio_simple_dummy.c >b/drivers/staging/iio/iio_simple_dummy.c >> >index 381f90f..5e19068 100644 >> >--- a/drivers/staging/iio/iio_simple_dummy.c >> >+++ b/drivers/staging/iio/iio_simple_dummy.c >> >@@ -1,4 +1,4 @@ >> >-/** >> >+/* >> This change should be in the 3rd patch. >> >Thanks for the eagle eyes! I see this (and the other comment I edit'd >also.) It leads to another question. > >In these dummy files, there are 27 comment blocks that start with >/** instead of /* . I touched 2 of them as a passerby, but now >that I'm looking.... should I change them all or is /** that an >acceptable >variation. > >alison > > >< snip > Good thing you raised this as one instance in the patch was an incorrect change away from ** Basically it should have two stars if kernel-doc (formal kernel documentation) and one star if a straightforward inline comment. See Documentation/kernel-doc-nano-howto.txt -- Sent from my Android device with K-9 Mail. Please excuse my brevity. ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 0/3] iio: dummy: scan index enum update and clean up 2015-10-23 16:54 [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements Alison Schofield ` (2 preceding siblings ...) 2015-10-26 8:11 ` Daniel Baluta @ 2015-10-26 20:46 ` Alison Schofield 2015-10-26 20:48 ` [PATCH 1/3] staging: iio: dummy: use uppercase descriptors for enum names Alison Schofield ` (2 more replies) 3 siblings, 3 replies; 13+ messages in thread From: Alison Schofield @ 2015-10-26 20:46 UTC (permalink / raw) To: outreachy-kernel This patchset obsoletes the prior single patch: [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements It is split into 3 patches that 1) udpate the existing enum list 2) add timestamp to the enum list 3) cleans one block comment checkpatch err Changes (other than splitting) since it was a single patch: - prefaced index names with DUMMY_ to be more descriptive - fit that block comment on one line by following model of preceeding comment - did not touch /** comments as they are used for extracting docs Alison Schofield (3): staging: iio: dummy: use uppercase descriptors for enum names staging: iio: dummy: add the timestamp buffer to the scan index enum staging: iio: dummy: replace block comment with single line comment drivers/staging/iio/iio_simple_dummy.c | 17 ++++++++--------- drivers/staging/iio/iio_simple_dummy.h | 18 ++++++++++-------- drivers/staging/iio/iio_simple_dummy_buffer.c | 9 +++++---- 3 files changed, 23 insertions(+), 21 deletions(-) -- 2.1.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] staging: iio: dummy: use uppercase descriptors for enum names 2015-10-26 20:46 ` [PATCH 0/3] iio: dummy: scan index enum update and clean up Alison Schofield @ 2015-10-26 20:48 ` Alison Schofield 2015-10-26 20:49 ` [PATCH 2/3] staging: iio: dummy: add the timestamp buffer to the scan index enum Alison Schofield 2015-10-26 20:50 ` [PATCH 3/3] staging: iio: dummy: replace block comment with single line comment Alison Schofield 2 siblings, 0 replies; 13+ messages in thread From: Alison Schofield @ 2015-10-26 20:48 UTC (permalink / raw) To: outreachy-kernel Replace lower case names in the enum dummy_scan_elements with uppercase names and a descriptive prefix: DUMMY_INDEX_ Signed-off-by: Alison Schofield <amsfield22@gmail.com> --- drivers/staging/iio/iio_simple_dummy.c | 8 ++++---- drivers/staging/iio/iio_simple_dummy.h | 16 ++++++++-------- drivers/staging/iio/iio_simple_dummy_buffer.c | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c index 381f90f..70a82cd 100644 --- a/drivers/staging/iio/iio_simple_dummy.c +++ b/drivers/staging/iio/iio_simple_dummy.c @@ -137,7 +137,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { */ .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), /* The ordering of elements in the buffer via an enum */ - .scan_index = voltage0, + .scan_index = DUMMY_INDEX_VOLTAGE_0, .scan_type = { /* Description of storage in buffer */ .sign = 'u', /* unsigned */ .realbits = 13, /* 13 bits */ @@ -176,7 +176,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { * sampling_frequency * The frequency in Hz at which the channels are sampled */ - .scan_index = diffvoltage1m2, + .scan_index = DUMMY_INDEX_DIFFVOLTAGE_1M2, .scan_type = { /* Description of storage in buffer */ .sign = 's', /* signed */ .realbits = 12, /* 12 bits */ @@ -194,7 +194,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), - .scan_index = diffvoltage3m4, + .scan_index = DUMMY_INDEX_DIFFVOLTAGE_3M4, .scan_type = { .sign = 's', .realbits = 11, @@ -221,7 +221,7 @@ static const struct iio_chan_spec iio_dummy_channels[] = { BIT(IIO_CHAN_INFO_CALIBSCALE) | BIT(IIO_CHAN_INFO_CALIBBIAS), .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ), - .scan_index = accelx, + .scan_index = DUMMY_INDEX_ACCELX, .scan_type = { /* Description of storage in buffer */ .sign = 's', /* signed */ .realbits = 16, /* 16 bits */ diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h index 5c2f4d0..b9069a1 100644 --- a/drivers/staging/iio/iio_simple_dummy.h +++ b/drivers/staging/iio/iio_simple_dummy.h @@ -98,18 +98,18 @@ iio_simple_dummy_events_unregister(struct iio_dev *indio_dev) /** * enum iio_simple_dummy_scan_elements - scan index enum - * @voltage0: the single ended voltage channel - * @diffvoltage1m2: first differential channel - * @diffvoltage3m4: second differenial channel - * @accelx: acceleration channel + * @DUMMY_INDEX_VOLTAGE_0: the single ended voltage channel + * @DUMMY_INDEX_DIFFVOLTAGE_1M2: first differential channel + * @DUMMY_INDEX_DIFFVOLTAGE_3M4: second differential channel + * @DUMMY_INDEX_ACCELX: acceleration channel * * Enum provides convenient numbering for the scan index. */ enum iio_simple_dummy_scan_elements { - voltage0, - diffvoltage1m2, - diffvoltage3m4, - accelx, + DUMMY_INDEX_VOLTAGE_0, + DUMMY_INDEX_DIFFVOLTAGE_1M2, + DUMMY_INDEX_DIFFVOLTAGE_3M4, + DUMMY_INDEX_ACCELX, }; #ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c index 00ed774..cf44a6f 100644 --- a/drivers/staging/iio/iio_simple_dummy_buffer.c +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c @@ -27,10 +27,10 @@ /* Some fake data */ static const s16 fakedata[] = { - [voltage0] = 7, - [diffvoltage1m2] = -33, - [diffvoltage3m4] = -2, - [accelx] = 344, + [DUMMY_INDEX_VOLTAGE_0] = 7, + [DUMMY_INDEX_DIFFVOLTAGE_1M2] = -33, + [DUMMY_INDEX_DIFFVOLTAGE_3M4] = -2, + [DUMMY_INDEX_ACCELX] = 344, }; /** -- 2.1.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/3] staging: iio: dummy: add the timestamp buffer to the scan index enum 2015-10-26 20:46 ` [PATCH 0/3] iio: dummy: scan index enum update and clean up Alison Schofield 2015-10-26 20:48 ` [PATCH 1/3] staging: iio: dummy: use uppercase descriptors for enum names Alison Schofield @ 2015-10-26 20:49 ` Alison Schofield 2015-10-27 5:48 ` [Outreachy kernel] " Greg KH 2015-10-26 20:50 ` [PATCH 3/3] staging: iio: dummy: replace block comment with single line comment Alison Schofield 2 siblings, 1 reply; 13+ messages in thread From: Alison Schofield @ 2015-10-26 20:49 UTC (permalink / raw) To: outreachy-kernel Replace the hard coded buffer index for IIO_CHAN SOFT_TIMESTAMP with an entry in the scan index enum. Signed-off-by: Alison Schofield <amsfield22@gmail.com> --- drivers/staging/iio/iio_simple_dummy.c | 6 +++--- drivers/staging/iio/iio_simple_dummy.h | 2 ++ drivers/staging/iio/iio_simple_dummy_buffer.c | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c index 70a82cd..2749746 100644 --- a/drivers/staging/iio/iio_simple_dummy.c +++ b/drivers/staging/iio/iio_simple_dummy.c @@ -230,10 +230,10 @@ static const struct iio_chan_spec iio_dummy_channels[] = { }, }, /* - * Convenience macro for timestamps. 4 is the index in - * the buffer. + * Convenience macro for timestamps. + * DUMMY_INDEX_TIMESTAMP is the index in the buffer. */ - IIO_CHAN_SOFT_TIMESTAMP(4), + IIO_CHAN_SOFT_TIMESTAMP(DUMMY_INDEX_TIMESTAMP), /* DAC channel out_voltage0_raw */ { .type = IIO_VOLTAGE, diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h index b9069a1..89fb650 100644 --- a/drivers/staging/iio/iio_simple_dummy.h +++ b/drivers/staging/iio/iio_simple_dummy.h @@ -102,6 +102,7 @@ iio_simple_dummy_events_unregister(struct iio_dev *indio_dev) * @DUMMY_INDEX_DIFFVOLTAGE_1M2: first differential channel * @DUMMY_INDEX_DIFFVOLTAGE_3M4: second differential channel * @DUMMY_INDEX_ACCELX: acceleration channel + * @DUMMY_INDEX_TIMESTAMP: timestamp channel * * Enum provides convenient numbering for the scan index. */ @@ -110,6 +111,7 @@ enum iio_simple_dummy_scan_elements { DUMMY_INDEX_DIFFVOLTAGE_1M2, DUMMY_INDEX_DIFFVOLTAGE_3M4, DUMMY_INDEX_ACCELX, + DUMMY_INDEX_TIMESTAMP, }; #ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c index cf44a6f..eea3e76 100644 --- a/drivers/staging/iio/iio_simple_dummy_buffer.c +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c @@ -31,6 +31,7 @@ static const s16 fakedata[] = { [DUMMY_INDEX_DIFFVOLTAGE_1M2] = -33, [DUMMY_INDEX_DIFFVOLTAGE_3M4] = -2, [DUMMY_INDEX_ACCELX] = 344, + [DUMMY_INDEX_TIMESTAMP] = 50, }; /** -- 2.1.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Outreachy kernel] [PATCH 2/3] staging: iio: dummy: add the timestamp buffer to the scan index enum 2015-10-26 20:49 ` [PATCH 2/3] staging: iio: dummy: add the timestamp buffer to the scan index enum Alison Schofield @ 2015-10-27 5:48 ` Greg KH 0 siblings, 0 replies; 13+ messages in thread From: Greg KH @ 2015-10-27 5:48 UTC (permalink / raw) To: Alison Schofield; +Cc: outreachy-kernel On Mon, Oct 26, 2015 at 01:49:35PM -0700, Alison Schofield wrote: > Replace the hard coded buffer index for IIO_CHAN SOFT_TIMESTAMP with > an entry in the scan index enum. > > Signed-off-by: Alison Schofield <amsfield22@gmail.com> > --- > drivers/staging/iio/iio_simple_dummy.c | 6 +++--- > drivers/staging/iio/iio_simple_dummy.h | 2 ++ > drivers/staging/iio/iio_simple_dummy_buffer.c | 1 + > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c > index 70a82cd..2749746 100644 > --- a/drivers/staging/iio/iio_simple_dummy.c > +++ b/drivers/staging/iio/iio_simple_dummy.c > @@ -230,10 +230,10 @@ static const struct iio_chan_spec iio_dummy_channels[] = { > }, > }, > /* > - * Convenience macro for timestamps. 4 is the index in > - * the buffer. > + * Convenience macro for timestamps. > + * DUMMY_INDEX_TIMESTAMP is the index in the buffer. > */ > - IIO_CHAN_SOFT_TIMESTAMP(4), > + IIO_CHAN_SOFT_TIMESTAMP(DUMMY_INDEX_TIMESTAMP), > /* DAC channel out_voltage0_raw */ > { > .type = IIO_VOLTAGE, > diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h > index b9069a1..89fb650 100644 > --- a/drivers/staging/iio/iio_simple_dummy.h > +++ b/drivers/staging/iio/iio_simple_dummy.h > @@ -102,6 +102,7 @@ iio_simple_dummy_events_unregister(struct iio_dev *indio_dev) > * @DUMMY_INDEX_DIFFVOLTAGE_1M2: first differential channel > * @DUMMY_INDEX_DIFFVOLTAGE_3M4: second differential channel > * @DUMMY_INDEX_ACCELX: acceleration channel > + * @DUMMY_INDEX_TIMESTAMP: timestamp channel > * > * Enum provides convenient numbering for the scan index. > */ > @@ -110,6 +111,7 @@ enum iio_simple_dummy_scan_elements { > DUMMY_INDEX_DIFFVOLTAGE_1M2, > DUMMY_INDEX_DIFFVOLTAGE_3M4, > DUMMY_INDEX_ACCELX, > + DUMMY_INDEX_TIMESTAMP, > }; > > #ifdef CONFIG_IIO_SIMPLE_DUMMY_BUFFER > diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c > index cf44a6f..eea3e76 100644 > --- a/drivers/staging/iio/iio_simple_dummy_buffer.c > +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c > @@ -31,6 +31,7 @@ static const s16 fakedata[] = { > [DUMMY_INDEX_DIFFVOLTAGE_1M2] = -33, > [DUMMY_INDEX_DIFFVOLTAGE_3M4] = -2, > [DUMMY_INDEX_ACCELX] = 344, > + [DUMMY_INDEX_TIMESTAMP] = 50, You just increased the size of this structure, why? ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] staging: iio: dummy: replace block comment with single line comment 2015-10-26 20:46 ` [PATCH 0/3] iio: dummy: scan index enum update and clean up Alison Schofield 2015-10-26 20:48 ` [PATCH 1/3] staging: iio: dummy: use uppercase descriptors for enum names Alison Schofield 2015-10-26 20:49 ` [PATCH 2/3] staging: iio: dummy: add the timestamp buffer to the scan index enum Alison Schofield @ 2015-10-26 20:50 ` Alison Schofield 2 siblings, 0 replies; 13+ messages in thread From: Alison Schofield @ 2015-10-26 20:50 UTC (permalink / raw) To: outreachy-kernel Replace one block comment with a single line comment. Follow style of previous comment and omit word channel, since it's clear the topic is channels. Addresses checkpatch.pl: WARNING: Block comments use * on subsequent lines Signed-off-by: Alison Schofield <amsfield22@gmail.com> --- drivers/staging/iio/iio_simple_dummy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c index 2749746..8c65b3c 100644 --- a/drivers/staging/iio/iio_simple_dummy.c +++ b/drivers/staging/iio/iio_simple_dummy.c @@ -364,8 +364,7 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev, ret = IIO_VAL_INT_PLUS_MICRO; break; case 1: - /* all differential adc channels -> - * 0.000001344 */ + /* all differential adc -> 0.000001344 */ *val = 0; *val2 = 1344; ret = IIO_VAL_INT_PLUS_NANO; -- 2.1.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-10-27 5:49 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-10-23 16:54 [PATCH] staging: iio: dummy: clean up the define and usage of dummy_scan_elements Alison Schofield 2015-10-25 2:33 ` [Outreachy kernel] " Greg KH 2015-10-25 10:54 ` Jonathan Cameron 2015-10-26 3:29 ` Alison Schofield 2015-10-26 7:21 ` Jonathan Cameron 2015-10-26 8:11 ` Daniel Baluta 2015-10-26 17:20 ` Alison Schofield 2015-10-26 17:32 ` Jonathan Cameron 2015-10-26 20:46 ` [PATCH 0/3] iio: dummy: scan index enum update and clean up Alison Schofield 2015-10-26 20:48 ` [PATCH 1/3] staging: iio: dummy: use uppercase descriptors for enum names Alison Schofield 2015-10-26 20:49 ` [PATCH 2/3] staging: iio: dummy: add the timestamp buffer to the scan index enum Alison Schofield 2015-10-27 5:48 ` [Outreachy kernel] " Greg KH 2015-10-26 20:50 ` [PATCH 3/3] staging: iio: dummy: replace block comment with single line comment Alison Schofield
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.