]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: adl_pci9118: remove 'dmabuf_panic_size' from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Sep 2014 20:05:35 +0000 (13:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Sep 2014 21:34:24 +0000 (14:34 -0700)
This member of the private data is only used in some #if 0'ed code. Remove
it along with the unused code.

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_pci9118.c

index dc5901493c9dcd895efbd71d22e7371e86dbab90..cc48fe57ceb5cbdb2db23da5ded6dd170b863347 100644 (file)
@@ -251,7 +251,6 @@ struct pci9118_private {
                                                 * for transfer
                                                 */
        unsigned int dmabuf_used_size[2];       /* which size was truly used */
-       unsigned int dmabuf_panic_size[2];
        int dmabuf_pages[2];                    /* number of pages in buffer */
        unsigned char exttrg_users;             /*
                                                 * bit field of external trigger
@@ -1122,22 +1121,6 @@ static int Compute_and_setup_dma(struct comedi_device *dev,
        devpriv->dmabuf_use_size[0] = dmalen0;
        devpriv->dmabuf_use_size[1] = dmalen1;
 
-#if 0
-       if (cmd->scan_end_arg < PCI9118_HALF_FIFO_SZ) {
-               devpriv->dmabuf_panic_size[0] =
-                   (PCI9118_HALF_FIFO_SZ / cmd->scan_end_arg +
-                    1) * cmd->scan_end_arg * sizeof(short);
-               devpriv->dmabuf_panic_size[1] =
-                   (PCI9118_HALF_FIFO_SZ / cmd->scan_end_arg +
-                    1) * cmd->scan_end_arg * sizeof(short);
-       } else {
-               devpriv->dmabuf_panic_size[0] =
-                   (cmd->scan_end_arg << 1) % devpriv->dmabuf_size[0];
-               devpriv->dmabuf_panic_size[1] =
-                   (cmd->scan_end_arg << 1) % devpriv->dmabuf_size[1];
-       }
-#endif
-
        pci9118_amcc_dma_ena(dev, false);
        pci9118_amcc_setup_dma(dev, 0);
        /* init DMA transfer */