From: H Hartley Sweeten Date: Tue, 4 Mar 2014 18:30:24 +0000 (-0700) Subject: staging: comedi: pcl816: tidy up the remaining register defines X-Git-Tag: firefly_0821_release~176^2~4193^2~619 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8e7709f3346feb1d01cdaa4fbeed447f5a6a6e3;p=firefly-linux-kernel-4.4.55.git staging: comedi: pcl816: tidy up the remaining register defines For aesthetics, rename the clear INT request register. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index f22cf8620670..6386ef7a0042 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -44,12 +44,16 @@ Configuration Options: #include "comedi_fc.h" #include "8253.h" +/* + * Register I/O map + */ #define PCL816_DO_DI_LSB_REG 0x00 #define PCL816_DO_DI_MSB_REG 0x01 #define PCL816_TIMER_BASE 0x04 #define PCL816_AI_LSB_REG 0x08 #define PCL816_AI_MSB_REG 0x09 #define PCL816_RANGE_REG 0x09 +#define PCL816_CLRINT_REG 0x0a #define PCL816_MUX_REG 0x0b #define PCL816_MUX_SCAN(_first, _last) (((_last) << 4) | (_first)) #define PCL816_CTRL_REG 0x0c @@ -73,9 +77,6 @@ Configuration Options: #define PCL816_STATUS_INTACT (1 << 6) #define PCL816_STATUS_DRDY (1 << 7) -/* W: clear INT request */ -#define PCL816_CLRINT 10 - #define MAGIC_DMA_WORD 0x5a5a static const struct comedi_lrange range_pcl816 = { @@ -255,7 +256,7 @@ static void pcl816_ai_setup_chanlist(struct comedi_device *dev, static void pcl816_ai_clear_eoc(struct comedi_device *dev) { /* writing any value clears the interrupt request */ - outb(0, dev->iobase + PCL816_CLRINT); + outb(0, dev->iobase + PCL816_CLRINT_REG); } static void pcl816_ai_soft_trig(struct comedi_device *dev)