Skip to content

Commit

Permalink
staging: comedi: addi_eeprom: don't pass the eeprom 'type'
Browse files Browse the repository at this point in the history
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 30, 2012
1 parent 14cb151 commit 5df2834
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,11 @@ static unsigned short addi_eeprom_readw(unsigned long iobase,

static void addi_eeprom_read_di_info(struct comedi_device *dev,
unsigned long iobase,
char *type,
unsigned short addr)
{
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp;

/* Number of channels */
Expand All @@ -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,
unsigned long iobase,
char *type,
unsigned short addr)
{
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp;

/* Number of channels */
Expand All @@ -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,
unsigned long iobase,
char *type,
unsigned short addr)
{
struct addi_private *devpriv = dev->private;
#if 0
const struct addi_board *this_board = comedi_board(dev);
char *type = this_board->pc_EepromChip;
unsigned short offset = 0;
unsigned short ntimers;
unsigned short tmp;
Expand Down Expand Up @@ -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,
unsigned long iobase,
char *type,
unsigned short addr)
{
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short tmp;

/* No of channels for 1st hard component */
Expand All @@ -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,
unsigned long iobase,
char *type,
unsigned short addr)
{
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private;
char *type = this_board->pc_EepromChip;
unsigned short offset;
unsigned short tmp;

Expand Down Expand Up @@ -336,25 +340,25 @@ static void addi_eeprom_read_info(struct comedi_device *dev,

switch (func) {
case EEPROM_DIGITALINPUT:
addi_eeprom_read_di_info(dev, iobase, type, addr);
addi_eeprom_read_di_info(dev, iobase, addr);
break;

case EEPROM_DIGITALOUTPUT:
addi_eeprom_read_do_info(dev, iobase, type, addr);
addi_eeprom_read_do_info(dev, iobase, addr);
break;

case EEPROM_ANALOGINPUT:
addi_eeprom_read_ai_info(dev, iobase, type, addr);
addi_eeprom_read_ai_info(dev, iobase, addr);
break;

case EEPROM_ANALOGOUTPUT:
addi_eeprom_read_ao_info(dev, iobase, type, addr);
addi_eeprom_read_ao_info(dev, iobase, addr);
break;

case EEPROM_TIMER:
case EEPROM_WATCHDOG:
case EEPROM_TIMER_WATCHDOG_COUNTER:
addi_eeprom_read_timer_info(dev, iobase, type, addr);
addi_eeprom_read_timer_info(dev, iobase, addr);
break;
}
}
Expand Down

0 comments on commit 5df2834

Please sign in to comment.