From: Ian Abbott Date: Fri, 5 Jun 2015 17:30:13 +0000 (+0100) Subject: staging: comedi: das08: rename and rewrite DAS08_EOC X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=851e5d5475de796560683e2a4b28af0a7da177e1;p=deliverable%2Flinux.git staging: comedi: das08: rename and rewrite DAS08_EOC The `DAS08_EOC` macro contains a mask for the "end of A/D conversion" bit in the status register. The logic is reverse sense in that the bit is set to 1 while the conversion is in progress and set to 0 when the conversion is complete. Rename the macro to `DAS08_STATUS_AI_BUSY` and add a comment. Also make use of the `BIT()` macro to define the value. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index eecbf4d95942..04843080b5e8 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -58,7 +58,7 @@ #define DAS08_AI_MSB_REG 0x01 /* (R) AI most significant bits */ #define DAS08_AI_TRIG_REG 0x01 /* (W) AI software trigger */ #define DAS08_STATUS_REG 0x02 /* (R) status */ -#define DAS08_EOC (1<<7) +#define DAS08_STATUS_AI_BUSY BIT(7) /* AI conversion in progress */ #define DAS08_IRQ (1<<3) #define DAS08_IP(x) (((x)>>4)&0x7) #define DAS08_CONTROL 2 @@ -206,7 +206,7 @@ static int das08_ai_eoc(struct comedi_device *dev, unsigned int status; status = inb(dev->iobase + DAS08_STATUS_REG); - if ((status & DAS08_EOC) == 0) + if ((status & DAS08_STATUS_AI_BUSY) == 0) return 0; return -EBUSY; }