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

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

staging: comedi: adv_pci1710: remove 'neverending_ai' from private data 



This member of the private data is not necessary. We can determine if
the analog input command is neverending by checking the cmd->stop_src:

  TRIG_COUNT -> !neverending_ai
  TRIG_NONE -> neverending_ai

Do that instead and remove the unnecessary member.

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 56556577

drivers/staging/comedi/drivers/adv_pci1710.c

+9 −18
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ static const struct boardtype boardtypes[] = { 
};



struct pci1710_private {

	char neverending_ai;	/*  we do unlimited AI */

	unsigned int CntrlReg;	/*  Control register */

	unsigned int i8254_osc_base;	/*  frequence of onboard oscilator */

	unsigned int ai_act_scan;	/*  how many scans we finished */
@@ -732,7 +731,6 @@ static int pci171x_ai_cancel(struct comedi_device *dev, 
	devpriv->ai_act_scan = 0;

	s->async->cur_chan = 0;

	devpriv->ai_buf_ptr = 0;

	devpriv->neverending_ai = 0;



	return 0;

}
@@ -800,8 +798,8 @@ static void interrupt_pci1710_every_sample(void *d) 


		if (s->async->cur_chan == 0) {	/*  one scan done */

			devpriv->ai_act_scan++;

			if ((!devpriv->neverending_ai) &&

			    (devpriv->ai_act_scan >= cmd->stop_arg)) {

			if (cmd->stop_src == TRIG_COUNT &&

			    devpriv->ai_act_scan >= cmd->stop_arg) {

				/*  all data sampled */

				s->async->events |= COMEDI_CB_EOA;

				cfc_handle_events(dev, s);
@@ -901,8 +899,8 @@ static void interrupt_pci1710_half_fifo(void *d) 
			return;

	}



	if (!devpriv->neverending_ai)

		if (devpriv->ai_act_scan >= cmd->stop_arg) {

	if (cmd->stop_src == TRIG_COUNT &&

	    devpriv->ai_act_scan >= cmd->stop_arg) {

		/* all data sampled */

		s->async->events |= COMEDI_CB_EOA;

		cfc_handle_events(dev, s);
@@ -976,7 +974,6 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	devpriv->ai_act_scan = 0;

	s->async->cur_chan = 0;

	devpriv->ai_buf_ptr = 0;

	devpriv->neverending_ai = 0;



	devpriv->CntrlReg &= Control_CNT0;

	/*  don't we want wake up every scan?  devpriv->ai_eos=1; */
@@ -987,12 +984,6 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
		devpriv->ai_eos = 0;

	}



	if (cmd->stop_arg == 0)

		devpriv->neverending_ai = 1;

	/* well, user want neverending */

	else

		devpriv->neverending_ai = 0;



	switch (mode) {

	case 1:

	case 2: