leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: adl_pci9118: sample types are unsigned

Browse Source 
Sample values in comedi are generally represented as unsigned values.
Change the `ao_data[]` and `dmabuf_virt[]` members of `struct
pci9118_private` and various local variables dealing with sample values
to use `unsigned short` instead of `short` for consistency.

Also remove the `short *ai_data` member of `struct pci9118_private` as
it is only assigned to.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2013-10-16 14:40:09 +01:00 committed by Greg Kroah-Hartman
parent b909ba8f8b
commit 6cda0d26b1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/adl_pci9118.c
View File

@ -352,12 +352,11 @@ struct pci9118_private {
* on external start * on external start
*/ */
unsigned int ai_data_len; unsigned int ai_data_len;
short *ai_data; unsigned short ao_data[2]; /* data output buffer */
short ao_data[2]; /* data output buffer */
unsigned int ai_scans; /* number of scans to do */ unsigned int ai_scans; /* number of scans to do */
char dma_doublebuf; /* we can use double buffering */ char dma_doublebuf; /* we can use double buffering */
unsigned int dma_actbuf; /* which buffer is used now */ unsigned int dma_actbuf; /* which buffer is used now */
short *dmabuf_virt[2]; /* unsigned short *dmabuf_virt[2]; /*
* pointers to begin of * pointers to begin of
* DMA buffer * DMA buffer
*/ */
@ -700,7 +699,7 @@ static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev)
static unsigned int defragment_dma_buffer(struct comedi_device *dev, static unsigned int defragment_dma_buffer(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
short *dma_buffer, unsigned short *dma_buffer,
unsigned int num_samples) unsigned int num_samples)
{ {
struct pci9118_private *devpriv = dev->private; struct pci9118_private *devpriv = dev->private;
@ -724,7 +723,7 @@ static unsigned int defragment_dma_buffer(struct comedi_device *dev,
static int move_block_from_dma(struct comedi_device *dev, static int move_block_from_dma(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
short *dma_buffer, unsigned short *dma_buffer,
unsigned int num_samples) unsigned int num_samples)
{ {
struct pci9118_private *devpriv = dev->private; struct pci9118_private *devpriv = dev->private;
@ -925,7 +924,7 @@ static void pci9118_ai_munge(struct comedi_device *dev,
{ {
struct pci9118_private *devpriv = dev->private; struct pci9118_private *devpriv = dev->private;
unsigned int i, num_samples = num_bytes / sizeof(short); unsigned int i, num_samples = num_bytes / sizeof(short);
short *array = data; unsigned short *array = data;
for (i = 0; i < num_samples; i++) { for (i = 0; i < num_samples; i++) {
if (devpriv->usedma) if (devpriv->usedma)
@ -945,7 +944,7 @@ static void interrupt_pci9118_ai_onesample(struct comedi_device *dev,
unsigned short int_daq) unsigned short int_daq)
{ {
struct pci9118_private *devpriv = dev->private; struct pci9118_private *devpriv = dev->private;
register short sampl; unsigned short sampl;
s->async->events = 0; s->async->events = 0;
@ -1613,7 +1612,6 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_n_chan = cmd->chanlist_len; devpriv->ai_n_chan = cmd->chanlist_len;
devpriv->ai_n_scanlen = cmd->scan_end_arg; devpriv->ai_n_scanlen = cmd->scan_end_arg;
devpriv->ai_chanlist = cmd->chanlist; devpriv->ai_chanlist = cmd->chanlist;
devpriv->ai_data = s->async->prealloc_buf;
devpriv->ai_data_len = s->async->prealloc_bufsz; devpriv->ai_data_len = s->async->prealloc_bufsz;
devpriv->ai_timer1 = 0; devpriv->ai_timer1 = 0;
devpriv->ai_timer2 = 0; devpriv->ai_timer2 = 0;
@ -1987,8 +1985,8 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
for (pages = 4; pages >= 0; pages--) { for (pages = 4; pages >= 0; pages--) {
devpriv->dmabuf_virt[i] = devpriv->dmabuf_virt[i] =
(short *)__get_free_pages(GFP_KERNEL, (unsigned short *)
pages); __get_free_pages(GFP_KERNEL, pages);
if (devpriv->dmabuf_virt[i]) if (devpriv->dmabuf_virt[i])
break; break;
} }