[PATCH 14/27] staging: comedi: addi_eeprom: use AMCC_OP_REG_* defines

H Hartley Sweeten hartleys at visionengravers.com
Tue Oct 30 00:06:42 UTC 2012


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 at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/addi-data/addi_eeprom.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index f3170e9..6c282ec 100644
--- 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)
-- 
1.7.11




More information about the devel mailing list