Commit 5df28346 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi_eeprom: don't pass the eeprom 'type'

The eeprom 'type' can be found from the boardinfo when needed.
Finding it when needed also makes it clearer what this value is.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14cb151d
...@@ -182,10 +182,11 @@ static unsigned short addi_eeprom_readw(unsigned long iobase, ...@@ -182,10 +182,11 @@ static unsigned short addi_eeprom_readw(unsigned long iobase,
static void addi_eeprom_read_di_info(struct comedi_device *dev, static void addi_eeprom_read_di_info(struct comedi_device *dev,
unsigned long iobase, unsigned long iobase,
char *type,
unsigned short addr) unsigned short addr)
{ {
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private; struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp; unsigned short tmp;
/* Number of channels */ /* Number of channels */
...@@ -202,10 +203,11 @@ static void addi_eeprom_read_di_info(struct comedi_device *dev, ...@@ -202,10 +203,11 @@ static void addi_eeprom_read_di_info(struct comedi_device *dev,
static void addi_eeprom_read_do_info(struct comedi_device *dev, static void addi_eeprom_read_do_info(struct comedi_device *dev,
unsigned long iobase, unsigned long iobase,
char *type,
unsigned short addr) unsigned short addr)
{ {
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private; struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp; unsigned short tmp;
/* Number of channels */ /* Number of channels */
...@@ -217,11 +219,12 @@ static void addi_eeprom_read_do_info(struct comedi_device *dev, ...@@ -217,11 +219,12 @@ static void addi_eeprom_read_do_info(struct comedi_device *dev,
static void addi_eeprom_read_timer_info(struct comedi_device *dev, static void addi_eeprom_read_timer_info(struct comedi_device *dev,
unsigned long iobase, unsigned long iobase,
char *type,
unsigned short addr) unsigned short addr)
{ {
struct addi_private *devpriv = dev->private; struct addi_private *devpriv = dev->private;
#if 0 #if 0
const struct addi_board *this_board = comedi_board(dev);
char *type = this_board->pc_EepromChip;
unsigned short offset = 0; unsigned short offset = 0;
unsigned short ntimers; unsigned short ntimers;
unsigned short tmp; unsigned short tmp;
...@@ -259,10 +262,11 @@ static void addi_eeprom_read_timer_info(struct comedi_device *dev, ...@@ -259,10 +262,11 @@ static void addi_eeprom_read_timer_info(struct comedi_device *dev,
static void addi_eeprom_read_ao_info(struct comedi_device *dev, static void addi_eeprom_read_ao_info(struct comedi_device *dev,
unsigned long iobase, unsigned long iobase,
char *type,
unsigned short addr) unsigned short addr)
{ {
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private; struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp; unsigned short tmp;
/* No of channels for 1st hard component */ /* No of channels for 1st hard component */
...@@ -277,11 +281,11 @@ static void addi_eeprom_read_ao_info(struct comedi_device *dev, ...@@ -277,11 +281,11 @@ static void addi_eeprom_read_ao_info(struct comedi_device *dev,
static void addi_eeprom_read_ai_info(struct comedi_device *dev, static void addi_eeprom_read_ai_info(struct comedi_device *dev,
unsigned long iobase, unsigned long iobase,
char *type,
unsigned short addr) unsigned short addr)
{ {
const struct addi_board *this_board = comedi_board(dev); const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private; struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short offset; unsigned short offset;
unsigned short tmp; unsigned short tmp;
...@@ -336,25 +340,25 @@ static void addi_eeprom_read_info(struct comedi_device *dev, ...@@ -336,25 +340,25 @@ static void addi_eeprom_read_info(struct comedi_device *dev,
switch (func) { switch (func) {
case EEPROM_DIGITALINPUT: case EEPROM_DIGITALINPUT:
addi_eeprom_read_di_info(dev, iobase, type, addr); addi_eeprom_read_di_info(dev, iobase, addr);
break; break;
case EEPROM_DIGITALOUTPUT: case EEPROM_DIGITALOUTPUT:
addi_eeprom_read_do_info(dev, iobase, type, addr); addi_eeprom_read_do_info(dev, iobase, addr);
break; break;
case EEPROM_ANALOGINPUT: case EEPROM_ANALOGINPUT:
addi_eeprom_read_ai_info(dev, iobase, type, addr); addi_eeprom_read_ai_info(dev, iobase, addr);
break; break;
case EEPROM_ANALOGOUTPUT: case EEPROM_ANALOGOUTPUT:
addi_eeprom_read_ao_info(dev, iobase, type, addr); addi_eeprom_read_ao_info(dev, iobase, addr);
break; break;
case EEPROM_TIMER: case EEPROM_TIMER:
case EEPROM_WATCHDOG: case EEPROM_WATCHDOG:
case EEPROM_TIMER_WATCHDOG_COUNTER: case EEPROM_TIMER_WATCHDOG_COUNTER:
addi_eeprom_read_timer_info(dev, iobase, type, addr); addi_eeprom_read_timer_info(dev, iobase, addr);
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment