]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: adl_pci9111: fix alignment issue
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 12 Oct 2015 17:42:32 +0000 (10:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Oct 2015 17:23:58 +0000 (10:23 -0700)
Use a local variable for the 'devpriv->ai_bounce_buffer' to shorten
the lines in pci9111_handle_fifo_half_full() and gix the checkpath.pl
issue about:

CHECK: Alignment should match open parenthesis

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/adl_pci9111.c

index 4996c24b8d2ad9a7bce33d2f6b59e0eac0407377..01d2ee931b28eedb9a1c4aa073b71720d88cbfae 100644 (file)
@@ -417,14 +417,14 @@ static void pci9111_handle_fifo_half_full(struct comedi_device *dev,
 {
        struct pci9111_private_data *devpriv = dev->private;
        struct comedi_cmd *cmd = &s->async->cmd;
+       unsigned short *buf = devpriv->ai_bounce_buffer;
        unsigned int samples;
 
        samples = comedi_nsamples_left(s, PCI9111_FIFO_HALF_SIZE);
-       insw(dev->iobase + PCI9111_AI_FIFO_REG,
-            devpriv->ai_bounce_buffer, samples);
+       insw(dev->iobase + PCI9111_AI_FIFO_REG, buf, samples);
 
        if (devpriv->scan_delay < 1) {
-               comedi_buf_write_samples(s, devpriv->ai_bounce_buffer, samples);
+               comedi_buf_write_samples(s, buf, samples);
        } else {
                unsigned int pos = 0;
                unsigned int to_read;
@@ -437,9 +437,7 @@ static void pci9111_handle_fifo_half_full(struct comedi_device *dev,
                                if (to_read > samples - pos)
                                        to_read = samples - pos;
 
-                               comedi_buf_write_samples(s,
-                                               devpriv->ai_bounce_buffer + pos,
-                                               to_read);
+                               comedi_buf_write_samples(s, buf + pos, to_read);
                        } else {
                                to_read = devpriv->chunk_num_samples -
                                          devpriv->chunk_counter;