From fcf782fc00e104197ea8e23d9846841767237ff8 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 29 Oct 2012 17:09:11 -0700
Subject: [PATCH] --- yaml --- r: 337457 b: refs/heads/master c:
 a927077c62688d1afefcda6da2a15d14a578a089 h: refs/heads/master i:   337455:
 18b1b3d04bf1291b7669beac1abe2ff22d2ee64e v: v3

---
 [refs]                                                   | 2 +-
 .../staging/comedi/drivers/addi-data/addi_common.c       | 3 +--
 .../staging/comedi/drivers/addi-data/addi_eeprom.c       | 9 ++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 31b82b24c17d..51192e26181a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f98fe207bfc457d9d1d40c4573f3eec8dcb2cae
+refs/heads/master: a927077c62688d1afefcda6da2a15d14a578a089
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 9064293c51ff..79beff15d68c 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -217,8 +217,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 			printk("\nEnable the interrupt for the controller");
 		}
 		printk("\nRead Eeprom");
-		i_EepromReadMainHeader(io_addr[0], this_board->pc_EepromChip,
-			dev);
+		addi_eeprom_read_info(dev, io_addr[0]);
 	} else {
 		printk("\nPCI Eeprom unused");
 	}
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index 7aa67a887775..fff04f81d92c 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -328,10 +328,11 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev,
 	devpriv->s_EeParameters.i_AiMaxdata = 0xffff >> (16 - tmp);
 }
 
-static int i_EepromReadMainHeader(unsigned long iobase,
-				  char *type,
-				  struct comedi_device *dev)
+static void addi_eeprom_read_info(struct comedi_device *dev,
+				  unsigned long iobase)
 {
+	const struct addi_board *this_board = comedi_board(dev);
+	char *type = this_board->pc_EepromChip;
 	unsigned short size;
 	unsigned char nfuncs;
 	int i;
@@ -372,6 +373,4 @@ static int i_EepromReadMainHeader(unsigned long iobase,
 			break;
 		}
 	}
-
-	return 0;
 }