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

staging: comedi: drivers: have core hook up default (*insn_read) for readback 



Most of the comedi drivers that provide readback for write only subdevices now
use the comedi core comedi_alloc_subdev_readback() helper to allocate the subdevice
'reaback' member instead of using some member in their private data. These drivers
also hook up the (*insn_read) callback to the comedi_readback_insn_read() helper to
provide the readback.

Have the core automatically hook up the (*insn_read) callback after allocating the
memory if the driver has not already hooked it up to a private function.

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

drivers/staging/comedi/drivers.c

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ int comedi_alloc_subdev_readback(struct comedi_subdevice *s) 
	s->readback = kcalloc(s->n_chan, sizeof(*s->readback), GFP_KERNEL);

	if (!s->readback)

		return -ENOMEM;



	if (!s->insn_read)

		s->insn_read = comedi_readback_insn_read;



	return 0;

}

EXPORT_SYMBOL_GPL(comedi_alloc_subdev_readback);

drivers/staging/comedi/drivers/addi_apci_3120.c

+0 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,6 @@ static int apci3120_auto_attach(struct comedi_device *dev, 
		s->maxdata	= 0x3fff;

		s->range_table	= &range_bipolar10;

		s->insn_write	= apci3120_ao_insn_write;

		s->insn_read	= comedi_readback_insn_read;



		ret = comedi_alloc_subdev_readback(s);

		if (ret)

drivers/staging/comedi/drivers/addi_apci_3501.c

+0 −1
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ static int apci3501_auto_attach(struct comedi_device *dev, 
		s->maxdata	= 0x3fff;

		s->range_table	= &apci3501_ao_range;

		s->insn_write	= apci3501_ao_insn_write;

		s->insn_read	= comedi_readback_insn_read;



		ret = comedi_alloc_subdev_readback(s);

		if (ret)

drivers/staging/comedi/drivers/addi_apci_3xxx.c

+0 −1
Original line number Diff line number Diff line
@@ -854,7 +854,6 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, 
		s->maxdata	= 0x0fff;

		s->range_table	= &apci3xxx_ao_range;

		s->insn_write	= apci3xxx_ao_insn_write;

		s->insn_read	= comedi_readback_insn_read;



		ret = comedi_alloc_subdev_readback(s);

		if (ret)

drivers/staging/comedi/drivers/adl_pci6208.c

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ static int pci6208_auto_attach(struct comedi_device *dev, 
	s->maxdata	= 0xffff;

	s->range_table	= &range_bipolar10;

	s->insn_write	= pci6208_ao_insn_write;

	s->insn_read	= comedi_readback_insn_read;



	ret = comedi_alloc_subdev_readback(s);

	if (ret)