lkml.org 
[lkml]   [2015]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/32] staging: comedi: das08: rename DAS08_STATUS
    Date
    The `DAS08_STATUS` macro contains the offset to the read-only status
    register. Rename it to `DAS08_STATUS_REG` and add a comment.

    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    ---
    drivers/staging/comedi/drivers/das08.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
    index fa14fa10..eecbf4d 100644
    --- a/drivers/staging/comedi/drivers/das08.c
    +++ b/drivers/staging/comedi/drivers/das08.c
    @@ -57,7 +57,7 @@
    #define DAS08_AI_LSB_REG 0x00 /* (R) AI least significant bits */
    #define DAS08_AI_MSB_REG 0x01 /* (R) AI most significant bits */
    #define DAS08_AI_TRIG_REG 0x01 /* (W) AI software trigger */
    -#define DAS08_STATUS 2
    +#define DAS08_STATUS_REG 0x02 /* (R) status */
    #define DAS08_EOC (1<<7)
    #define DAS08_IRQ (1<<3)
    #define DAS08_IP(x) (((x)>>4)&0x7)
    @@ -205,7 +205,7 @@ static int das08_ai_eoc(struct comedi_device *dev,
    {
    unsigned int status;

    - status = inb(dev->iobase + DAS08_STATUS);
    + status = inb(dev->iobase + DAS08_STATUS_REG);
    if ((status & DAS08_EOC) == 0)
    return 0;
    return -EBUSY;
    @@ -282,7 +282,7 @@ static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s,
    struct comedi_insn *insn, unsigned int *data)
    {
    data[0] = 0;
    - data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS));
    + data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS_REG));

    return insn->n;
    }
    --
    2.1.4


    \
     
     \ /
      Last update: 2015-06-05 20:01    [W:4.038 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site