Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7c0afa4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: quatech_daqp_cs: cleanup subdevice init 



Remove the dev_info() board attach noise.

For aesthetic reasons, add some whitespace to the subdevice init.

Remove the init of the s->len_chanlist for the subdevices that do
not support commands. It's not used by them and the comedi core
will handle initializing it properly in the postconfig.

Change the return after a successful attach to "0". The comedi
core expects a < 0 value to indicate an error and "0" is the
typical value returned to indicate success.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c65c64d0

drivers/staging/comedi/drivers/quatech_daqp_cs.c

+30 −35
Original line number Diff line number Diff line
@@ -767,9 +767,6 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	if (ret)

		return ret;



	dev_info(dev->class_dev, "attaching daqp%d (io 0x%04lx)\n",

		 it->options[0], dev->iobase);



	s = &dev->subdevices[0];

	dev->read_subdev = s;

	s->private	= local;
@@ -790,7 +787,6 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	s->type		= COMEDI_SUBD_AO;

	s->subdev_flags	= SDF_WRITEABLE;

	s->n_chan	= 2;

	s->len_chanlist = 1;

	s->maxdata	= 0x0fff;

	s->range_table	= &range_bipolar5;

	s->insn_write	= daqp_ao_insn_write;
@@ -800,7 +796,6 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	s->type		= COMEDI_SUBD_DI;

	s->subdev_flags	= SDF_READABLE;

	s->n_chan	= 1;

	s->len_chanlist = 1;

	s->insn_read	= daqp_di_insn_read;



	s = &dev->subdevices[3];
@@ -811,7 +806,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	s->len_chanlist	= 1;

	s->insn_write	= daqp_do_insn_write;



	return 1;

	return 0;

}



static void daqp_detach(struct comedi_device *dev)