|
@@ -80,14 +80,14 @@ static void __comedi_buf_free(struct comedi_device *dev,
|
|
|
|
|
|
static void __comedi_buf_alloc(struct comedi_device *dev,
|
|
|
struct comedi_subdevice *s,
|
|
|
- unsigned n_pages)
|
|
|
+ unsigned int n_pages)
|
|
|
{
|
|
|
struct comedi_async *async = s->async;
|
|
|
struct page **pages = NULL;
|
|
|
struct comedi_buf_map *bm;
|
|
|
struct comedi_buf_page *buf;
|
|
|
unsigned long flags;
|
|
|
- unsigned i;
|
|
|
+ unsigned int i;
|
|
|
|
|
|
if (!IS_ENABLED(CONFIG_HAS_DMA) && s->async_dma_dir != DMA_NONE) {
|
|
|
dev_err(dev->class_dev,
|
|
@@ -208,7 +208,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
|
|
|
|
|
|
/* allocate new buffer */
|
|
|
if (new_size) {
|
|
|
- unsigned n_pages = new_size >> PAGE_SHIFT;
|
|
|
+ unsigned int n_pages = new_size >> PAGE_SHIFT;
|
|
|
|
|
|
__comedi_buf_alloc(dev, s, n_pages);
|
|
|
|
|
@@ -302,7 +302,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 = comedi_bytes_per_sample(s);
|
|
|
+ const unsigned int num_sample_bytes = comedi_bytes_per_sample(s);
|
|
|
|
|
|
if (!s->munge || (async->cmd.flags & CMDF_RAWDATA)) {
|
|
|
async->munge_count += num_bytes;
|
|
@@ -395,7 +395,7 @@ EXPORT_SYMBOL_GPL(comedi_buf_write_free);
|
|
|
unsigned int comedi_buf_read_n_available(struct comedi_subdevice *s)
|
|
|
{
|
|
|
struct comedi_async *async = s->async;
|
|
|
- unsigned num_bytes;
|
|
|
+ unsigned int num_bytes;
|
|
|
|
|
|
if (!async)
|
|
|
return 0;
|