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

staging: comedi: addi_common.h: remove 'pui_AiChannelList' from private data 



This member of the private data is a copy of the cmd->chanlist. Use that
instead.

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 72af0c4e

drivers/staging/comedi/drivers/addi-data/addi_common.h

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ struct addi_private { 
	unsigned char b_AiContinuous;	/*  we do unlimited AI */

	unsigned int ui_AiActualScan;	/* how many scans we finished */

	unsigned int ui_AiNbrofChannels;	/*  how many channels is measured */

	unsigned int *pui_AiChannelList;	/*  actual chanlist */

	unsigned int ui_AiChannelList[32];	/*  actual chanlist */

	unsigned int ui_AiReadData[32];

	unsigned int ui_AiTimer0;	/* Timer Constant for Timer0 */

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+1 −2
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static int apci3120_cyclic_ai(int mode, 
	/* Initializes the sequence array */

   /**********************************/

	if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels,

			devpriv->pui_AiChannelList, 0))

			cmd->chanlist, 0))

		return -EINVAL;



	us_TmpValue = (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS);
@@ -1338,7 +1338,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev, 


	/* loading private structure with cmd structure inputs */

	devpriv->ui_AiNbrofChannels = cmd->chanlist_len;

	devpriv->pui_AiChannelList = cmd->chanlist;



	/* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */

	devpriv->ui_AiDataLength = s->async->prealloc_bufsz;

CRA Git | Maintained and supported by SUSTech CRA and CCSE