[patch] staging: comedi: das16: remove a duplicate condition

[patch] staging: comedi: das16: remove a duplicate condition

[Dan Carpenter]

We checked that "it->options[3]" was non-zero on the line before so
there is no need to check again.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index d7cf4b1..056bca9 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -1032,8 +1032,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	/*  check that clock setting is valid */
 	if (it->options[3]) {
-		if (it->options[3] != 0 &&
-		    it->options[3] != 1 && it->options[3] != 10) {
+		if (it->options[3] != 1 && it->options[3] != 10) {
 			dev_err(dev->class_dev,
 				"Invalid option. Master clock must be set to 1 or 10 (MHz)\n");
 			return -EINVAL;

RE: [patch] staging: comedi: das16: remove a duplicate condition

[Hartley Sweeten]

On Wednesday, July 29, 2015 2:37 PM, Dan Carpenter wrote:
> We checked that "it->options[3]" was non-zero on the line before so
> there is no need to check again.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
v
> diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
> index d7cf4b1..056bca9 100644
> --- a/drivers/staging/comedi/drivers/das16.c
> +++ b/drivers/staging/comedi/drivers/das16.c
> @@ -1032,8 +1032,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
>  
>  	/*  check that clock setting is valid */
>  	if (it->options[3]) {
> -		if (it->options[3] != 0 &&
> -		    it->options[3] != 1 && it->options[3] != 10) {
> +		if (it->options[3] != 1 && it->options[3] != 10) {
>  			dev_err(dev->class_dev,
>  				"Invalid option. Master clock must be set to 1 or 10 (MHz)\n");
>  			return -EINVAL;

Thanks,

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>

Re: [patch] staging: comedi: das16: remove a duplicate condition

[walter harms]

Am 29.07.2015 23:36, schrieb Dan Carpenter:
> We checked that "it->options[3]" was non-zero on the line before so
> there is no need to check again.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
> index d7cf4b1..056bca9 100644
> --- a/drivers/staging/comedi/drivers/das16.c
> +++ b/drivers/staging/comedi/drivers/das16.c
> @@ -1032,8 +1032,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
>  
>  	/*  check that clock setting is valid */
>  	if (it->options[3]) {
> -		if (it->options[3] != 0 &&
> -		    it->options[3] != 1 && it->options[3] != 10) {
> +		if (it->options[3] != 1 && it->options[3] != 10) {
>  			dev_err(dev->class_dev,
>  				"Invalid option. Master clock must be set to 1 or 10 (MHz)\n");
>  			return -EINVAL;

mmh, acording to the error messages 1 or 10 is allowed, obviously 0 is/was also valid.
I would suggest to put that into one if () to make things more obvious.
It 0 is also valid a minor tweak to the error msg would be nice.


re,
 wh

Re: [patch] staging: comedi: das16: remove a duplicate condition

[Dan Carpenter]

On Thu, Jul 30, 2015 at 09:18:56AM +0200, walter harms wrote:
> 
> 
> Am 29.07.2015 23:36, schrieb Dan Carpenter:
> > We checked that "it->options[3]" was non-zero on the line before so
> > there is no need to check again.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > 
> > diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
> > index d7cf4b1..056bca9 100644
> > --- a/drivers/staging/comedi/drivers/das16.c
> > +++ b/drivers/staging/comedi/drivers/das16.c
> > @@ -1032,8 +1032,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> >  
> >  	/*  check that clock setting is valid */
> >  	if (it->options[3]) {
> > -		if (it->options[3] != 0 &&
> > -		    it->options[3] != 1 && it->options[3] != 10) {
> > +		if (it->options[3] != 1 && it->options[3] != 10) {
> >  			dev_err(dev->class_dev,
> >  				"Invalid option. Master clock must be set to 1 or 10 (MHz)\n");
> >  			return -EINVAL;
> 
> mmh, acording to the error messages 1 or 10 is allowed, obviously 0 is/was also valid.
> I would suggest to put that into one if () to make things more obvious.
> It 0 is also valid a minor tweak to the error msg would be nice.

Zero values are not used.  If you are going to set it then it has to be
1 or 10.  The message makes sense and matches the logic of the code.

regards,
dan carpenter

Re: [patch] staging: comedi: das16: remove a duplicate condition

[Ian Abbott]

On 29/07/15 22:36, Dan Carpenter wrote:
> We checked that "it->options[3]" was non-zero on the line before so
> there is no need to check again.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
> index d7cf4b1..056bca9 100644
> --- a/drivers/staging/comedi/drivers/das16.c
> +++ b/drivers/staging/comedi/drivers/das16.c
> @@ -1032,8 +1032,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
>
>   	/*  check that clock setting is valid */
>   	if (it->options[3]) {
> -		if (it->options[3] != 0 &&
> -		    it->options[3] != 1 && it->options[3] != 10) {
> +		if (it->options[3] != 1 && it->options[3] != 10) {
>   			dev_err(dev->class_dev,
>   				"Invalid option. Master clock must be set to 1 or 10 (MHz)\n");
>   			return -EINVAL;
>

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-