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

staging: comedi: addi_apci_3120: clarify AI subdevice init 



The two boards supported by this driver use the same functions for
the comedi operations. Remove this data from the boardinfo to clarify
the subdevice init.

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 e0f8f2d2

drivers/staging/comedi/drivers/addi_apci_3120.c

+5 −17
Original line number Original line Diff line number Diff line
@@ -34,11 +34,6 @@ static const struct addi_board apci3120_boardtypes[] = { 
		.ui_MinDelaytimeNs	= 100000,

		.ui_MinDelaytimeNs	= 100000,

		.interrupt		= v_APCI3120_Interrupt,

		.interrupt		= v_APCI3120_Interrupt,

		.reset			= i_APCI3120_Reset,

		.reset			= i_APCI3120_Reset,

		.ai_config		= i_APCI3120_InsnConfigAnalogInput,

		.ai_read		= i_APCI3120_InsnReadAnalogInput,

		.ai_cmdtest		= i_APCI3120_CommandTestAnalogInput,

		.ai_cmd			= i_APCI3120_CommandAnalogInput,

		.ai_cancel		= i_APCI3120_StopCyclicAcquisition,

		.ao_write		= i_APCI3120_InsnWriteAnalogOutput,

		.ao_write		= i_APCI3120_InsnWriteAnalogOutput,

	}, {

	}, {

		.pc_DriverName		= "apci3001",

		.pc_DriverName		= "apci3001",
@@ -60,11 +55,6 @@ static const struct addi_board apci3120_boardtypes[] = { 
		.ui_MinDelaytimeNs	= 100000,

		.ui_MinDelaytimeNs	= 100000,

		.interrupt		= v_APCI3120_Interrupt,

		.interrupt		= v_APCI3120_Interrupt,

		.reset			= i_APCI3120_Reset,

		.reset			= i_APCI3120_Reset,

		.ai_config		= i_APCI3120_InsnConfigAnalogInput,

		.ai_read		= i_APCI3120_InsnReadAnalogInput,

		.ai_cmdtest		= i_APCI3120_CommandTestAnalogInput,

		.ai_cmd			= i_APCI3120_CommandAnalogInput,

		.ai_cancel		= i_APCI3120_StopCyclicAcquisition,

	},

	},

};

};
@@ -197,13 +187,11 @@ static int apci3120_attach_pci(struct comedi_device *dev, 
	/* Set the initialisation flag */

	/* Set the initialisation flag */

	devpriv->b_AiInitialisation = 1;

	devpriv->b_AiInitialisation = 1;





	s->insn_config = this_board->ai_config;

	s->insn_config = i_APCI3120_InsnConfigAnalogInput;

	s->insn_read = this_board->ai_read;

	s->insn_read = i_APCI3120_InsnReadAnalogInput;

	s->insn_write = this_board->ai_write;

	s->do_cmdtest = i_APCI3120_CommandTestAnalogInput;

	s->insn_bits = this_board->ai_bits;

	s->do_cmd = i_APCI3120_CommandAnalogInput;

	s->do_cmdtest = this_board->ai_cmdtest;

	s->cancel = i_APCI3120_StopCyclicAcquisition;

	s->do_cmd = this_board->ai_cmd;

	s->cancel = this_board->ai_cancel;





	/*  Allocate and Initialise AO Subdevice Structures */

	/*  Allocate and Initialise AO Subdevice Structures */

	s = &dev->subdevices[1];

	s = &dev->subdevices[1];