[PATCH] Staging: comedi: range: tidy up comedi_check_chanlist()
Refactor this function to remove an extra indent level
Signed-off-by: Fred Akers
---
drivers/staging/comedi/range.c | 39 +++
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index 46b3da6..c4bb13b 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -143,29 +143,28 @@ int comedi_check_chanlist(struct comedi_subdevice *s, int
n,
unsigned int chanspec;
int chan, range_len, i;
- if (s->range_table || s->range_table_list) {
- for (i = 0; i < n; i++) {
- chanspec = chanlist[i];
- chan = CR_CHAN(chanspec);
- if (s->range_table)
- range_len = s->range_table->length;
- else if (s->range_table_list && chan < s->n_chan)
- range_len = s->range_table_list[chan]->length;
- else
- range_len = 0;
- if (chan >= s->n_chan ||
- CR_RANGE(chanspec) >= range_len ||
- aref_invalid(s, chanspec)) {
- dev_warn(dev->class_dev,
-"bad chanlist[%d]=0x%08x chan=%d range
length=%d\n",
-i, chanspec, chan, range_len);
- return -EINVAL;
- }
- }
- } else {
+ if (!s->range_table && !s->range_table_list) {
dev_err(dev->class_dev, "(bug) no range type list!\n");
return -EINVAL;
}
+ for (i = 0; i < n; i++) {
+ chanspec = chanlist[i];
+ chan = CR_CHAN(chanspec);
+ if (s->range_table)
+ range_len = s->range_table->length;
+ else if (s->range_table_list && chan < s->n_chan)
+ range_len = s->range_table_list[chan]->length;
+ else
+ range_len = 0;
+ if (chan >= s->n_chan ||
+ CR_RANGE(chanspec) >= range_len ||
+ aref_invalid(s, chanspec)) {
+ dev_warn(dev->class_dev,
+"bad chanlist[%d]=0x%08x chan=%d range
length=%d\n",
+i, chanspec, chan, range_len);
+ return -EINVAL;
+ }
+ }
return 0;
}
EXPORT_SYMBOL_GPL(comedi_check_chanlist);
--
1.8.5.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: comedi: range: remove unnecessary sanity check
This check is unnecessary because range_table will always be
initialized to range_unknown by comedi_device_postconfig() for
drivers that do not initialize range_table or range_table_list
Signed-off-by: Fred Akers
---
Apply this after first patch
drivers/staging/comedi/range.c | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index c4bb13b..b684954 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -143,10 +143,6 @@ int comedi_check_chanlist(struct comedi_subdevice *s, int
n,
unsigned int chanspec;
int chan, range_len, i;
- if (!s->range_table && !s->range_table_list) {
- dev_err(dev->class_dev, "(bug) no range type list!\n");
- return -EINVAL;
- }
for (i = 0; i < n; i++) {
chanspec = chanlist[i];
chan = CR_CHAN(chanspec);
--
1.8.5.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/2] Staging: comedi: range: tidy up comedi_check_chanlist()
Refactor this function to remove an extra indent level
Signed-off-by: Fred Akers
---
drivers/staging/comedi/range.c | 39 +++
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index 46b3da6..c4bb13b 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -143,29 +143,28 @@ int comedi_check_chanlist(struct comedi_subdevice *s, int
n,
unsigned int chanspec;
int chan, range_len, i;
- if (s->range_table || s->range_table_list) {
- for (i = 0; i < n; i++) {
- chanspec = chanlist[i];
- chan = CR_CHAN(chanspec);
- if (s->range_table)
- range_len = s->range_table->length;
- else if (s->range_table_list && chan < s->n_chan)
- range_len = s->range_table_list[chan]->length;
- else
- range_len = 0;
- if (chan >= s->n_chan ||
- CR_RANGE(chanspec) >= range_len ||
- aref_invalid(s, chanspec)) {
- dev_warn(dev->class_dev,
-"bad chanlist[%d]=0x%08x chan=%d range
length=%d\n",
-i, chanspec, chan, range_len);
- return -EINVAL;
- }
- }
- } else {
+ if (!s->range_table && !s->range_table_list) {
dev_err(dev->class_dev, "(bug) no range type list!\n");
return -EINVAL;
}
+ for (i = 0; i < n; i++) {
+ chanspec = chanlist[i];
+ chan = CR_CHAN(chanspec);
+ if (s->range_table)
+ range_len = s->range_table->length;
+ else if (s->range_table_list && chan < s->n_chan)
+ range_len = s->range_table_list[chan]->length;
+ else
+ range_len = 0;
+ if (chan >= s->n_chan ||
+ CR_RANGE(chanspec) >= range_len ||
+ aref_invalid(s, chanspec)) {
+ dev_warn(dev->class_dev,
+"bad chanlist[%d]=0x%08x chan=%d range
length=%d\n",
+i, chanspec, chan, range_len);
+ return -EINVAL;
+ }
+ }
return 0;
}
EXPORT_SYMBOL_GPL(comedi_check_chanlist);
--
1.8.5.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/2] Staging: comedi: range: remove unnecessary sanity check
This check is unnecessary because range_table will always be
initialized to range_unknown by comedi_device_postconfig() for
drivers that do not initialize range_table or range_table_list
Signed-off-by: Fred Akers
---
drivers/staging/comedi/range.c | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index c4bb13b..b684954 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -143,10 +143,6 @@ int comedi_check_chanlist(struct comedi_subdevice *s, int
n,
unsigned int chanspec;
int chan, range_len, i;
- if (!s->range_table && !s->range_table_list) {
- dev_err(dev->class_dev, "(bug) no range type list!\n");
- return -EINVAL;
- }
for (i = 0; i < n; i++) {
chanspec = chanlist[i];
chan = CR_CHAN(chanspec);
--
1.8.5.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: comedi: apci_1564: Fix long CamelCase function names
This patch fixes a few function names that are very long and are
not in the correct naming style
Signed-off-by: Fred Akers
---
.../comedi/drivers/addi-data/hwdrv_apci1564.c | 62 ++
drivers/staging/comedi/drivers/addi_apci_1564.c| 16 +++---
2 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index a31e115..cb426e7 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -116,7 +116,7 @@ static unsigned int ui_InterruptData, ui_Type;
/*
++
-| Function Name : int i_APCI1564_ConfigDigitalInput |
+| Function Name : int i_apci1564_di_config |
|(struct comedi_device *dev,struct comedi_subdevice
*s, |
| struct comedi_insn *insn,unsigned int *data)
|
++
@@ -141,10 +141,9 @@ static unsigned int ui_InterruptData, ui_Type;
|
|
++
*/
-static int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev,
-struct comedi_subdevice *s,
-struct comedi_insn *insn,
-unsigned int *data)
+static int i_apci1564_di_config(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ struct comedi_insn *insn, unsigned int *data)
{
struct addi_private *devpriv = dev->private;
@@ -184,7 +183,7 @@ static int apci1564_di_insn_bits(struct comedi_device *dev,
/*
++
-| Function Name : int i_APCI1564_ConfigDigitalOutput |
+| Function Name : int i_apci1564_do_config |
|(struct comedi_device *dev,struct comedi_subdevice
*s, |
| struct comedi_insn *insn,unsigned int *data)
|
++
@@ -207,10 +206,9 @@ static int apci1564_di_insn_bits(struct comedi_device *dev,
|
|
++
*/
-static int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev,
- struct comedi_subdevice *s,
- struct comedi_insn *insn,
- unsigned int *data)
+static int i_apci1564_do_config(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ struct comedi_insn *insn, unsigned int *data)
{
struct addi_private *devpriv = dev->private;
unsigned int ul_Command = 0;
@@ -261,7 +259,7 @@ static int apci1564_do_insn_bits(struct comedi_device *dev,
/*
++
-| Function Name : int i_APCI1564_ConfigTimerCounterWatchdog |
+| Function Name : int i_apci1564_timer_config |
|(struct comedi_device *dev,struct comedi_subdevice
*s, |
| struct comedi_insn *insn,unsigned int *data)
|
++
@@ -289,10 +287,9 @@ static int apci1564_do_insn_bits(struct comedi_device *dev,
|
|
++
*/
-static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
-struct comedi_subdevice *s,
-struct comedi_insn *insn,
-unsigned int *data)
+static int i_apci1564_timer_config(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ struct comedi_insn *insn, unsigned int *data)
{
struct addi_private *devpriv = dev->private;
unsigned int ul_Command1 = 0;
@@ -384,7 +381,7 @@ static int i_APCI1564_ConfigTimerCounterWatchdog(struct
comedi_device *dev,
/*
++
-| Function Nam
Re: [PATCH] Staging: comedi: apci_1564: Fix long CamelCase function names
On Tuesday, March 11, 2014 02:31:07 PM Ian Abbott wrote: > On 2014-03-09 07:26, Fred Akers wrote: > > This patch fixes a few function names that are very long and are > > not in the correct naming style > > > > Signed-off-by: Fred Akers > > --- > > > > .../comedi/drivers/addi-data/hwdrv_apci1564.c | 62 > > ++ drivers/staging/comedi/drivers/addi_apci_1564.c > > | 16 +++--- > > 2 files changed, 36 insertions(+), 42 deletions(-) > > > > diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c > > b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index > > a31e115..cb426e7 100644 > > --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c > > +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c > > @@ -116,7 +116,7 @@ static unsigned int ui_InterruptData, ui_Type; > > > > /* > > +--- > > -+> > > -| Function Name : int i_APCI1564_ConfigDigitalInput > >| +| Function Name : int i_apci1564_di_config > > | > It would be nice to get rid of the silly i_, v_ prefixes as well! I'll submit a V2 removing those prefixes. I'm working on doing similar renames on functions for the other files under the addi-data directory as well. I'll include those in the V2 patch. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3 1/2] Staging: comedi: addi-data: Fix long CamelCase function names
On Wednesday, March 12, 2014 01:06:27 AM Hartley Sweeten wrote: > On Tuesday, March 11, 2014 3:19 PM, Fred Akers wrote: > > This patch fixes a few function names that are very long and are > > not in the correct naming style > > > > Signed-off-by: Fred Akers > > Fred, > > I pulled Greg's staging tree to see if your patches apply. > > Patch 1/2 is ok but patch 2/2 does not apply: > > Applying: Staging: Comedi: addi-data: Clean up function comments > error: patch failed: > drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c:1 error: > drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c: patch does not > apply error: patch failed: > drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c:1 error: > drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c: patch does not > apply error: patch failed: > drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c:1 error: > drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c: patch does not > apply Patch failed at 0001 Staging: Comedi: addi-data: Clean up function > comments > > Maybe Greg will have better luck. > > Regards, > Hartley I think maybe the character encoding may have upset something? I'll wait and see if Greg has any luck. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
