Skip to content

Commit

Permalink
staging: comedi: addi_eeprom: cleanup i_EepromReadMainHeader()
Browse files Browse the repository at this point in the history
Add namespace by renaming this CamelCase function to
addi_eeprom_read_info().

Remove the 'type' parameter. This parameter is a char pointer to the
string name of the eeprom type used on the board. This can be found
when needed using the dev pointer.

Change the parameter order so that the comedi_device pointer is passed
first.

The return value is always 0 and it's never checked. Change it to void.

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 6f98fe2 commit a927077
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi-data/addi_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
9 changes: 4 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -372,6 +373,4 @@ static int i_EepromReadMainHeader(unsigned long iobase,
break;
}
}

return 0;
}

0 comments on commit a927077

Please sign in to comment.