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

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

staging: comedi: comedi_buf: absorb __comedi_buf_write_alloc() 



This function is only called by comedi_buf_write_alloc(). Absorb it and remove
the unused 'strict' parameter.

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 e19a3c97

drivers/staging/comedi/comedi_buf.c

+4 −11
Original line number Diff line number Diff line
@@ -252,15 +252,15 @@ static unsigned int comedi_buf_write_n_available(struct comedi_subdevice *s) 
	return free_end - async->buf_write_alloc_count;

}



static unsigned int __comedi_buf_write_alloc(struct comedi_subdevice *s,

					     unsigned int nbytes,

					     int strict)

/* allocates chunk for the writer from free buffer space */

unsigned int comedi_buf_write_alloc(struct comedi_subdevice *s,

				    unsigned int nbytes)

{

	struct comedi_async *async = s->async;

	unsigned int available = comedi_buf_write_n_available(s);



	if (nbytes > available)

		nbytes = strict ? 0 : available;

		nbytes = available;



	async->buf_write_alloc_count += nbytes;
@@ -272,13 +272,6 @@ static unsigned int __comedi_buf_write_alloc(struct comedi_subdevice *s, 


	return nbytes;

}



/* allocates chunk for the writer from free buffer space */

unsigned int comedi_buf_write_alloc(struct comedi_subdevice *s,

				    unsigned int nbytes)

{

	return __comedi_buf_write_alloc(s, nbytes, 0);

}

EXPORT_SYMBOL_GPL(comedi_buf_write_alloc);



/*