lkml.org 
[lkml]   [2012]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 56/83] staging: comedi: rtd520: remove RtdDacRange macro
    Date
    This macro uses the 'devpriv' macro which relies on a local variable
    having a specific name. Plus it's just a wrapper around a simple
    'writew'. Remove the macro.

    Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Cc: Ian Abbott <abbotti@mev.co.uk>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/staging/comedi/drivers/rtd520.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
    index ebe74bf..8cd056c 100644
    --- a/drivers/staging/comedi/drivers/rtd520.c
    +++ b/drivers/staging/comedi/drivers/rtd520.c
    @@ -406,11 +406,6 @@ struct rtdPrivate {

    /* Macros to access registers */

    -/* Set DAC output type and range */
    -#define RtdDacRange(dev, n, v) \
    - writew((v) & 7, devpriv->las0 \
    - +(((n) == 0) ? LAS0_DAC1_CTRL : LAS0_DAC2_CTRL))
    -
    /* Reset DAC FIFO */
    #define RtdDacClearFifo(dev, n) \
    writel(0, devpriv->las0+(((n) == 0) ? LAS0_DAC1_RESET : \
    @@ -1538,7 +1533,8 @@ static int rtd_ao_winsn(struct comedi_device *dev,
    int range = CR_RANGE(insn->chanspec);

    /* Configure the output range (table index matches the range values) */
    - RtdDacRange(dev, chan, range);
    + writew(range & 7, devpriv->las0 +
    + ((chan == 0) ? LAS0_DAC1_CTRL : LAS0_DAC2_CTRL));

    /* Writing a list of values to an AO channel is probably not
    * very useful, but that's how the interface is defined. */
    --
    1.7.11


    \
     
     \ /
      Last update: 2012-07-11 03:21    [W:0.022 / U:93.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site