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

staging: comedi: addi_apci_2032: remove use of devpriv->s_EeParameters 



This driver no longer reads the eeprom to find the board specific data,
all the necessary data is in the boardinfo. Use the boardinfo directly
instead of passing through devpriv->s_EeParameters.

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 ff5eb17e

drivers/staging/comedi/drivers/addi_apci_2032.c

+5 −23
Original line number Diff line number Diff line
@@ -88,23 +88,6 @@ static int apci2032_auto_attach(struct comedi_device *dev, 
		return ret;

	dev->iobase = pci_resource_start(pcidev, 1);



	/* Initialize parameters that can be overridden in EEPROM */

	devpriv->s_EeParameters.i_NbrAiChannel = this_board->i_NbrAiChannel;

	devpriv->s_EeParameters.i_NbrAoChannel = this_board->i_NbrAoChannel;

	devpriv->s_EeParameters.i_AiMaxdata = this_board->i_AiMaxdata;

	devpriv->s_EeParameters.i_AoMaxdata = this_board->i_AoMaxdata;

	devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel;

	devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;

	devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata;

	devpriv->s_EeParameters.i_Dma = this_board->i_Dma;

	devpriv->s_EeParameters.i_Timer = this_board->i_Timer;

	devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =

		this_board->ui_MinAcquisitiontimeNs;

	devpriv->s_EeParameters.ui_MinDelaytimeNs =

		this_board->ui_MinDelaytimeNs;



	/* ## */



	if (pcidev->irq > 0) {

		ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,

				  dev->board_name, dev);
@@ -131,14 +114,13 @@ static int apci2032_auto_attach(struct comedi_device *dev, 


	/*  Allocate and Initialise DO Subdevice Structures */

	s = &dev->subdevices[3];

	if (devpriv->s_EeParameters.i_NbrDoChannel) {

	if (this_board->i_NbrDoChannel) {

		s->type = COMEDI_SUBD_DO;

		s->subdev_flags =

			SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;

		s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;

		s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;

		s->len_chanlist =

			devpriv->s_EeParameters.i_NbrDoChannel;

		s->n_chan = this_board->i_NbrDoChannel;

		s->maxdata = this_board->i_DoMaxdata;

		s->len_chanlist = this_board->i_NbrDoChannel;

		s->range_table = &range_digital;

		s->io_bits = 0xf;	/* all bits output */
@@ -153,7 +135,7 @@ static int apci2032_auto_attach(struct comedi_device *dev, 


	/*  Allocate and Initialise Timer Subdevice Structures */

	s = &dev->subdevices[4];

	if (devpriv->s_EeParameters.i_Timer) {

	if (this_board->i_Timer) {

		s->type = COMEDI_SUBD_TIMER;

		s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;

		s->n_chan = 1;