staging: comedi: addi_eeprom: use AMCC_OP_REG_* defines

Use the AMCC_OP_REG_* register offset defines for the magic numbers
used to read the nvram data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index f3170e90c5f585695ab634ee43267286f85b8271..6c282ec95c18b212ad27d01d5c84a10349fee89d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -184,7 +184,7 @@ static void addi_eeprom_nvram_wait(unsigned long iobase)
        unsigned char val;
 
        do {
-               val = inb(iobase + 0x3F);
+               val = inb(iobase + AMCC_OP_REG_MCSR_NVCMD);
        } while (val & 0x80);
 }
 
@@ -197,21 +197,21 @@ static unsigned short addi_eeprom_readw_nvram(unsigned long iobase,
 
        for (i = 0; i < 2; i++) {
                /* Load the low 8 bit address */
-               outb(NVCMD_LOAD_LOW, iobase + 0x3F);
+               outb(NVCMD_LOAD_LOW, iobase + AMCC_OP_REG_MCSR_NVCMD);
                addi_eeprom_nvram_wait(iobase);
-               outb((addr + i) & 0xff, iobase + 0x3E);
+               outb((addr + i) & 0xff, iobase + AMCC_OP_REG_MCSR_NVDATA);
                addi_eeprom_nvram_wait(iobase);
 
                /* Load the high 8 bit address */
-               outb(NVCMD_LOAD_HIGH, iobase + 0x3F);
+               outb(NVCMD_LOAD_HIGH, iobase + AMCC_OP_REG_MCSR_NVCMD);
                addi_eeprom_nvram_wait(iobase);
-               outb(((addr + i) >> 8) & 0xff, iobase + 0x3E);
+               outb(((addr + i) >> 8) & 0xff, iobase + AMCC_OP_REG_MCSR_NVDATA);
                addi_eeprom_nvram_wait(iobase);
 
                /* Read the eeprom data byte */
-               outb(NVCMD_BEGIN_READ, iobase + 0x3F);
+               outb(NVCMD_BEGIN_READ, iobase + AMCC_OP_REG_MCSR_NVCMD);
                addi_eeprom_nvram_wait(iobase);
-               tmp = inb(iobase + 0x3E);
+               tmp = inb(iobase + AMCC_OP_REG_MCSR_NVDATA);
                addi_eeprom_nvram_wait(iobase);
 
                if (i == 0)