Staging: comedi: adl_pci9118: fixed some parentheses coding style issue
PATCH 1/1 Staging: comedi: adl_pci9118: fixed some parentheses coding style issue
Fixed some code style issues.
--- drivers/staging/comedi/drivers/adl_pci9118.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/comedi/drivers/adl_pci9118.c +6 -6
@@ -947,7 +947,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)if (devpriv->master) { devpriv->usedma =1 ;if ((cmd->flags &CMDF_WAKE_EOS ) && - (cmd->scan_end_arg ==1 )) { + cmd->scan_end_arg ==1 ) {if (cmd->convert_src ==TRIG_NOW ) devpriv->ai_add_back =1 ;if (cmd->convert_src ==TRIG_TIMER ) {
@@ -960,7 +960,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) }if ((cmd->flags &CMDF_WAKE_EOS ) && (cmd->scan_end_arg &1 ) && - (cmd->scan_end_arg >1 )) { + cmd->scan_end_arg >1 ) {if (cmd->scan_begin_src ==TRIG_FOLLOW ) { devpriv->usedma =0 ;/*
@@ -983,7 +983,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)*/ if (cmd->convert_src ==TRIG_NOW && devpriv->softsshdelay) { devpriv->ai_add_front =2 ; -if ((devpriv->usedma ==1 ) && (devpriv->ai_add_back ==1 )) { +if (devpriv->usedma ==1 && devpriv->ai_add_back ==1 ) {/* move it to front */ devpriv->ai_add_front++; devpriv->ai_add_back =0 ;
@@ -1185,7 +1185,7 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, (!(cmd->convert_src & (TRIG_TIMER | TRIG_NOW)))) err |= -EINVAL ; -if ((cmd->scan_begin_src ==TRIG_FOLLOW ) && +if (cmd->scan_begin_src ==TRIG_FOLLOW && (!(cmd->convert_src & (TRIG_TIMER |TRIG_EXT )))) err |= -EINVAL ;
@@ -1210,8 +1210,8 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,if (cmd->scan_begin_src & (TRIG_FOLLOW |TRIG_EXT )) err |=comedi_check_trigger_arg_is (&cmd->scan_begin_arg,0 ); -if ((cmd->scan_begin_src ==TRIG_TIMER ) && - (cmd->convert_src ==TRIG_TIMER ) && (cmd->scan_end_arg ==1 )) { +if (cmd->scan_begin_src ==TRIG_TIMER && + cmd->convert_src ==TRIG_TIMER && cmd->scan_end_arg ==1 ) { cmd->scan_begin_src =TRIG_FOLLOW ; cmd->convert_arg = cmd->scan_begin_arg; cmd->scan_begin_arg =0 ;
Signature · 1 line
2.15.0
You may like to limit the git log brief description to 50 characters (this is going to be hard with such a long pre-fix though :)
Brief description should be in imperative mood i.e 'Fix foo' instead of 'fixed foo'.
Quoted 1 line · Guilherme Tadashi Maeoka
Fixed some code style issues.
This is not descriptive enough. You may like to read
Documentation/process/submitting-patches.rst
for tips on writing git log messages.
Quoted 10 lines
Signed-off-by Guilherme Tadashi Maeoka <[email protected]>--- drivers/staging/comedi/drivers/adl_pci9118.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/staging/comedi/drivers/adl_pci9118.c +0
-0
drivers/staging/comedi/drivers/adl_pci9118.c static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) · line 950
Quoted 5 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1@@ -947,7 +947,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)if (devpriv->master) { devpriv->usedma =1 ;if ((cmd->flags &CMDF_WAKE_EOS ) && - (cmd->scan_end_arg ==1 )) { + cmd->scan_end_arg ==1 ) {
The code was easier to read before this change IMO.
Quoted 13 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1if (cmd->convert_src ==TRIG_NOW ) devpriv->ai_add_back =1 ;if (cmd->convert_src ==TRIG_TIMER ) {@@ -960,7 +960,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) }if ((cmd->flags &CMDF_WAKE_EOS ) && (cmd->scan_end_arg &1 ) && - (cmd->scan_end_arg >1 )) { + cmd->scan_end_arg >1 ) {if (cmd->scan_begin_src ==TRIG_FOLLOW ) { devpriv->usedma =0 ;/*
drivers/staging/comedi/drivers/adl_pci9118.c static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) · line 986
Quoted 5 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1@@ -983,7 +983,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)*/ if (cmd->convert_src ==TRIG_NOW && devpriv->softsshdelay) { devpriv->ai_add_front =2 ; -if ((devpriv->usedma ==1 ) && (devpriv->ai_add_back ==1 )) { +if (devpriv->usedma ==1 && devpriv->ai_add_back ==1 ) {
Likewise, this is not making the code easier to read.
Quoted 13 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1/* move it to front */ devpriv->ai_add_front++; devpriv->ai_add_back =0 ;@@ -1185,7 +1185,7 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, (!(cmd->convert_src & (TRIG_TIMER | TRIG_NOW)))) err |= -EINVAL ; -if ((cmd->scan_begin_src ==TRIG_FOLLOW ) && +if (cmd->scan_begin_src ==TRIG_FOLLOW && (!(cmd->convert_src & (TRIG_TIMER |TRIG_EXT )))) err |= -EINVAL ;
drivers/staging/comedi/drivers/adl_pci9118.c static int pci9118_ai_cmdtest(struct comedi_device *dev, · line 1217
Quoted 10 lines
drivers/staging/comedi/drivers/adl_pci9118.c +2
-2@@ -1210,8 +1210,8 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,if (cmd->scan_begin_src & (TRIG_FOLLOW |TRIG_EXT )) err |=comedi_check_trigger_arg_is (&cmd->scan_begin_arg,0 ); -if ((cmd->scan_begin_src ==TRIG_TIMER ) && - (cmd->convert_src ==TRIG_TIMER ) && (cmd->scan_end_arg ==1 )) { +if (cmd->scan_begin_src ==TRIG_TIMER && + cmd->convert_src ==TRIG_TIMER && cmd->scan_end_arg ==1 ) { cmd->scan_begin_src =TRIG_FOLLOW ; cmd->convert_arg = cmd->scan_begin_arg; cmd->scan_begin_arg =0 ;
Remember, we are writing code for developers to read. It should be as easy to parse as possible.
Hope this helps,
Tobin.
Thank you. I'll keep that in mind next time!
Quoted 83 lines · Tobin C. Harding
You may like to limit the git log brief description to 50 characters (this is going to be hard with such a long pre-fix though :)
Brief description should be in imperative mood i.e 'Fix foo' instead of 'fixed foo'.
Quoted 1 line · Guilherme Tadashi Maeoka
Fixed some code style issues.
This is not descriptive enough. You may like to read
Documentation/process/submitting-patches.rstfor tips on writing git log messages.
Quoted 10 lines
Signed-off-by Guilherme Tadashi Maeoka <[email protected]>--- drivers/staging/comedi/drivers/adl_pci9118.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/staging/comedi/drivers/adl_pci9118.c +0
-0drivers/staging/comedi/drivers/adl_pci9118.c static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) · line 950
Quoted 5 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1@@ -947,7 +947,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)if (devpriv->master) { devpriv->usedma =1 ;if ((cmd->flags &CMDF_WAKE_EOS ) && - (cmd->scan_end_arg ==1 )) { + cmd->scan_end_arg ==1 ) {The code was easier to read before this change IMO.
Quoted 13 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1if (cmd->convert_src ==TRIG_NOW ) devpriv->ai_add_back =1 ;if (cmd->convert_src ==TRIG_TIMER ) {@@ -960,7 +960,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) }if ((cmd->flags &CMDF_WAKE_EOS ) && (cmd->scan_end_arg &1 ) && - (cmd->scan_end_arg >1 )) { + cmd->scan_end_arg >1 ) {if (cmd->scan_begin_src ==TRIG_FOLLOW ) { devpriv->usedma =0 ;/* drivers/staging/comedi/drivers/adl_pci9118.c static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) · line 986
Quoted 5 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1@@ -983,7 +983,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)*/ if (cmd->convert_src ==TRIG_NOW && devpriv->softsshdelay) { devpriv->ai_add_front =2 ; -if ((devpriv->usedma ==1 ) && (devpriv->ai_add_back ==1 )) { +if (devpriv->usedma ==1 && devpriv->ai_add_back ==1 ) {Likewise, this is not making the code easier to read.
Quoted 13 lines
drivers/staging/comedi/drivers/adl_pci9118.c +1
-1/* move it to front */ devpriv->ai_add_front++; devpriv->ai_add_back =0 ;@@ -1185,7 +1185,7 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, (!(cmd->convert_src & (TRIG_TIMER | TRIG_NOW)))) err |= -EINVAL ; -if ((cmd->scan_begin_src ==TRIG_FOLLOW ) && +if (cmd->scan_begin_src ==TRIG_FOLLOW && (!(cmd->convert_src & (TRIG_TIMER |TRIG_EXT )))) err |= -EINVAL ;drivers/staging/comedi/drivers/adl_pci9118.c static int pci9118_ai_cmdtest(struct comedi_device *dev, · line 1217
Quoted 10 lines
drivers/staging/comedi/drivers/adl_pci9118.c +2
-2@@ -1210,8 +1210,8 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,if (cmd->scan_begin_src & (TRIG_FOLLOW |TRIG_EXT )) err |=comedi_check_trigger_arg_is (&cmd->scan_begin_arg,0 ); -if ((cmd->scan_begin_src ==TRIG_TIMER ) && - (cmd->convert_src ==TRIG_TIMER ) && (cmd->scan_end_arg ==1 )) { +if (cmd->scan_begin_src ==TRIG_TIMER && + cmd->convert_src ==TRIG_TIMER && cmd->scan_end_arg ==1 ) { cmd->scan_begin_src =TRIG_FOLLOW ; cmd->convert_arg = cmd->scan_begin_arg; cmd->scan_begin_arg =0 ;Remember, we are writing code for developers to read. It should be as easy to parse as possible.
Hope this helps,
Tobin.