[PATCH 35/38] staging: comedi: das16: remove an unnecessary check in the attach

H Hartley Sweeten hsweeten at visionengravers.com
Mon Jul 29 21:07:30 UTC 2013


If the user does not specify the analog output range the private data
'user_ao_range_table' will not be allocated. The comedi core will detect
the NULL s->range_table and automatically set it to &range_unknown.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/das16.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 9944f71..00ecb3c 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -1148,11 +1148,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		s->subdev_flags	= SDF_WRITABLE;
 		s->n_chan	= 2;
 		s->maxdata	= 0x0fff;
-		if (devpriv->user_ao_range_table)
-			s->range_table	= devpriv->user_ao_range_table;
-		else
-			s->range_table	= &range_unknown;
-
+		s->range_table	= devpriv->user_ao_range_table;
 		s->insn_write	= das16_ao_insn_write;
 	} else {
 		s->type		= COMEDI_SUBD_UNUSED;
-- 
1.8.3.2



More information about the devel mailing list