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

staging: comedi: remove use of 'bytes_per_sample()' 



This inline helper function has been replaced with comedi_bytes_per_sample().
The same commit (bf33eb4b) introduced a couple other related helper
functions a manipulate the sample size.

Use the new helper functions to remove the use of 'bytes_per_sample()' and
remove it.

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 272fe8f5

drivers/staging/comedi/comedi_buf.c

+9 −5
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static unsigned int comedi_buf_munge(struct comedi_subdevice *s, 
{

	struct comedi_async *async = s->async;

	unsigned int count = 0;

	const unsigned num_sample_bytes = bytes_per_sample(s);

	const unsigned num_sample_bytes = comedi_bytes_per_sample(s);



	if (!s->munge || (async->cmd.flags & CMDF_RAWDATA)) {

		async->munge_count += num_bytes;
@@ -489,7 +489,8 @@ unsigned int comedi_buf_write_samples(struct comedi_subdevice *s, 
	 * If not, clamp the nsamples to the number that will fit, flag the

	 * buffer overrun and add the samples that fit.

	 */

	max_samples = comedi_buf_write_n_available(s) / bytes_per_sample(s);

	max_samples = comedi_bytes_to_samples(s,

					      comedi_buf_write_n_available(s));

	if (nsamples > max_samples) {

		dev_warn(s->device->class_dev, "buffer overrun\n");

		s->async->events |= COMEDI_CB_OVERFLOW;
@@ -499,7 +500,8 @@ unsigned int comedi_buf_write_samples(struct comedi_subdevice *s, 
	if (nsamples == 0)

		return 0;



	nbytes = comedi_buf_write_alloc(s, nsamples * bytes_per_sample(s));

	nbytes = comedi_buf_write_alloc(s,

					comedi_samples_to_bytes(s, nsamples));

	comedi_buf_memcpy_to(s, data, nbytes);

	comedi_buf_write_free(s, nbytes);

	comedi_inc_scan_progress(s, nbytes);
@@ -527,14 +529,16 @@ unsigned int comedi_buf_read_samples(struct comedi_subdevice *s, 
	unsigned int nbytes;



	/* clamp nsamples to the number of full samples available */

	max_samples = comedi_buf_read_n_available(s) / bytes_per_sample(s);

	max_samples = comedi_bytes_to_samples(s,

					      comedi_buf_read_n_available(s));

	if (nsamples > max_samples)

		nsamples = max_samples;



	if (nsamples == 0)

		return 0;



	nbytes = comedi_buf_read_alloc(s, nsamples * bytes_per_sample(s));

	nbytes = comedi_buf_read_alloc(s,

				       comedi_samples_to_bytes(s, nsamples));

	comedi_buf_memcpy_from(s, data, nbytes);

	comedi_buf_read_free(s, nbytes);

	comedi_inc_scan_progress(s, nbytes);

drivers/staging/comedi/comedi_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -2024,7 +2024,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait) 


	s = comedi_write_subdevice(dev, minor);

	if (s && s->async) {

		unsigned int bps = bytes_per_sample(s);

		unsigned int bps = comedi_bytes_per_sample(s);



		poll_wait(file, &s->async->wait_head, wait);

		comedi_buf_write_alloc(s, s->async->prealloc_bufsz);

drivers/staging/comedi/comedidev.h

+0 −6
Original line number Diff line number Diff line
@@ -427,12 +427,6 @@ static inline unsigned int comedi_bytes_per_sample(struct comedi_subdevice *s) 
	return s->subdev_flags & SDF_LSAMPL ? sizeof(int) : sizeof(short);

}



/* to be removed */

static inline unsigned int bytes_per_sample(struct comedi_subdevice *s)

{

	return comedi_bytes_per_sample(s);

}



/**

 * comedi_sample_shift - determine log2 of subdevice sample size

 * @s:		comedi_subdevice struct

drivers/staging/comedi/drivers.c

+2 −2
Original line number Diff line number Diff line
@@ -316,14 +316,14 @@ unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s) 
	case COMEDI_SUBD_DI:

	case COMEDI_SUBD_DO:

	case COMEDI_SUBD_DIO:

		bits_per_sample = 8 * bytes_per_sample(s);

		bits_per_sample = 8 * comedi_bytes_per_sample(s);

		num_samples = DIV_ROUND_UP(cmd->chanlist_len, bits_per_sample);

		break;

	default:

		num_samples = cmd->chanlist_len;

		break;

	}

	return num_samples * bytes_per_sample(s);

	return comedi_samples_to_bytes(s, num_samples);

}

EXPORT_SYMBOL_GPL(comedi_bytes_per_scan);

drivers/staging/comedi/drivers/cb_pcidas.c

+1 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ static void cb_pcidas_ao_load_fifo(struct comedi_device *dev, 
		nsamples = devpriv->ao_count;



	nbytes = comedi_buf_read_samples(s, devpriv->ao_buffer, nsamples);

	nsamples = nbytes / bytes_per_sample(s);

	nsamples = comedi_bytes_to_samples(s, nbytes);

	if (cmd->stop_src == TRIG_COUNT)

		devpriv->ao_count -= nsamples;

CRA Git | Maintained and supported by SUSTech CRA and CCSE