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

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

staging: comedi: addi_apci_1516: remove eeprom support code 



Reading the eeprom on the boards supported by this driver is not
necessary. All the information required is in the boardinfo.

Remove the eeprom support code since it's not really interesting
or useful.

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 aa459d0c

drivers/staging/comedi/drivers/addi_apci_1516.c

+1 −45
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#define COMEDI_SUBD_TTLIO   11	/* Digital Input Output But TTL */

#endif



#include "addi-data/addi_eeprom.c"

#include "addi-data/hwdrv_apci1516.c"



static const struct addi_board apci1516_boardtypes[] = {
@@ -61,23 +60,6 @@ static const struct addi_board apci1516_boardtypes[] = { 
	},

};



static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,

				     struct comedi_subdevice *s,

				     struct comedi_insn *insn,

				     unsigned int *data)

{

	const struct addi_board *this_board = comedi_board(dev);

	struct addi_private *devpriv = dev->private;

	unsigned short w_Address = CR_CHAN(insn->chanspec);

	unsigned short w_Data;



	w_Data = addi_eeprom_readw(devpriv->i_IobaseAmcc,

		this_board->pc_EepromChip, 2 * w_Address);

	data[0] = w_Data;



	return insn->n;

}



static irqreturn_t v_ADDI_Interrupt(int irq, void *d)

{

	struct comedi_device *dev = d;
@@ -120,7 +102,6 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev, 
	struct addi_private *devpriv;

	struct comedi_subdevice *s;

	int ret, n_subdevices;

	unsigned int dw_Dummy;



	this_board = addi_find_boardinfo(dev, pcidev);

	if (!this_board)
@@ -181,23 +162,6 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev, 
			dev->irq = pcidev->irq;

	}



	/*  Read eepeom and fill addi_board Structure */



	if (this_board->i_PCIEeprom) {

		if (!(strcmp(this_board->pc_EepromChip, "S5920"))) {

			/*  Set 3 wait stait */

			if (!(strcmp(dev->board_name, "apci035"))) {

				outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);

			} else {

				outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);

			}

			/*  Enable the interrupt for the controller */

			dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);

			outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);

		}

		addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));

	}



	n_subdevices = 7;

	ret = comedi_alloc_subdevices(dev, n_subdevices);

	if (ret)
@@ -275,15 +239,7 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev, 


	/* EEPROM */

	s = &dev->subdevices[6];

	if (this_board->i_PCIEeprom) {

		s->type = COMEDI_SUBD_MEMORY;

		s->subdev_flags = SDF_READABLE | SDF_INTERNAL;

		s->n_chan = 256;

		s->maxdata = 0xffff;

		s->insn_read = i_ADDIDATA_InsnReadEeprom;

	} else {

	s->type = COMEDI_SUBD_UNUSED;

	}



	i_ADDI_Reset(dev);

	return 0;