lkml.org 
[lkml]   [2012]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/36] staging: comedi: cb_pcidas: remove forward declarations 4
    Date
    Move the cb_pcida_cancel function to remove the need for
    the forward declaration.

    Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Cc: Ian Abbott <abbotti@mev.co.uk>
    Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/staging/comedi/drivers/cb_pcidas.c | 42 ++++++++++++++----------------
    1 file changed, 20 insertions(+), 22 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
    index 584f85b..fa3ed0e 100644
    --- a/drivers/staging/comedi/drivers/cb_pcidas.c
    +++ b/drivers/staging/comedi/drivers/cb_pcidas.c
    @@ -447,8 +447,6 @@ struct cb_pcidas_private {
    */
    #define devpriv ((struct cb_pcidas_private *)dev->private)

    -static int cb_pcidas_cancel(struct comedi_device *dev,
    - struct comedi_subdevice *s);
    static int cb_pcidas_ao_cancel(struct comedi_device *dev,
    struct comedi_subdevice *s);
    static void cb_pcidas_load_counters(struct comedi_device *dev, unsigned int *ns,
    @@ -1128,6 +1126,26 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,
    return 0;
    }

    +/* cancel analog input command */
    +static int cb_pcidas_cancel(struct comedi_device *dev,
    + struct comedi_subdevice *s)
    +{
    + unsigned long flags;
    +
    + spin_lock_irqsave(&dev->spinlock, flags);
    + /* disable interrupts */
    + devpriv->adc_fifo_bits &= ~INTE & ~EOAIE;
    + outw(devpriv->adc_fifo_bits, devpriv->control_status + INT_ADCFIFO);
    + spin_unlock_irqrestore(&dev->spinlock, flags);
    +
    + /* disable start trigger source and burst mode */
    + outw(0, devpriv->control_status + TRIG_CONTSTAT);
    + /* software pacer source */
    + outw(0, devpriv->control_status + ADCMUX_CONT);
    +
    + return 0;
    +}
    +
    static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
    struct comedi_subdevice *s,
    unsigned int trig_num)
    @@ -1409,26 +1427,6 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
    return IRQ_HANDLED;
    }

    -/* cancel analog input command */
    -static int cb_pcidas_cancel(struct comedi_device *dev,
    - struct comedi_subdevice *s)
    -{
    - unsigned long flags;
    -
    - spin_lock_irqsave(&dev->spinlock, flags);
    - /* disable interrupts */
    - devpriv->adc_fifo_bits &= ~INTE & ~EOAIE;
    - outw(devpriv->adc_fifo_bits, devpriv->control_status + INT_ADCFIFO);
    - spin_unlock_irqrestore(&dev->spinlock, flags);
    -
    - /* disable start trigger source and burst mode */
    - outw(0, devpriv->control_status + TRIG_CONTSTAT);
    - /* software pacer source */
    - outw(0, devpriv->control_status + ADCMUX_CONT);
    -
    - return 0;
    -}
    -
    /* cancel analog output command */
    static int cb_pcidas_ao_cancel(struct comedi_device *dev,
    struct comedi_subdevice *s)
    --
    1.7.11


    \
     
     \ /
      Last update: 2012-06-27 04:01    [W:0.039 / U:1.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site