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

Commit 7ec52ed2 authored by Alessio Igor Bogani's avatar Alessio Igor Bogani Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion. 



Build tested only.

Signed-off-by: default avatarAlessio Igor Bogani <abogani@texware.it>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a57941c2

drivers/staging/comedi/drivers/quatech_daqp_cs.c

+8 −7
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308 
#include <pcmcia/cisreg.h>

#include <pcmcia/ds.h>



#include <linux/completion.h>



/* Maximum number of separate DAQP devices we'll allow */

#define MAX_DEV         4
@@ -67,7 +69,7 @@ struct local_info_t { 


	enum { semaphore, buffer } interrupt_mode;



	struct semaphore eos;

	struct completion eos;



	struct comedi_device *dev;

	struct comedi_subdevice *s;
@@ -238,7 +240,7 @@ static int daqp_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) 
/* Interrupt handler

 *

 * Operates in one of two modes.  If local->interrupt_mode is

 * 'semaphore', just signal the local->eos semaphore and return

 * 'semaphore', just signal the local->eos completion and return

 * (one-shot mode).  Otherwise (continuous mode), read data in from

 * the card, transfer it to the buffer provided by the higher-level

 * comedi kernel module, and signal various comedi callback routines,
@@ -287,7 +289,7 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id) 


	case semaphore:



		up(&local->eos);

		complete(&local->eos);

		break;



	case buffer:
@@ -401,8 +403,7 @@ static int daqp_ai_insn_read(struct comedi_device *dev, 
		return -1;

	}



	/* Make sure semaphore is blocked */

	sema_init(&local->eos, 0);

	init_completion(&local->eos);

	local->interrupt_mode = semaphore;

	local->dev = dev;

	local->s = s;
@@ -413,9 +414,9 @@ static int daqp_ai_insn_read(struct comedi_device *dev, 
		outb(DAQP_COMMAND_ARM | DAQP_COMMAND_FIFO_DATA,

		     dev->iobase + DAQP_COMMAND);



		/* Wait for interrupt service routine to unblock semaphore */

		/* Wait for interrupt service routine to unblock completion */

		/* Maybe could use a timeout here, but it's interruptible */

		if (down_interruptible(&local->eos))

		if (wait_for_completion_interruptible(&local->eos))

			return -EINTR;



		data[i] = inb(dev->iobase + DAQP_FIFO);