unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short tmp;
                                     unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short tmp;
 {
        struct addi_private *devpriv = dev->private;
 #if 0
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        char *type = this_board->pc_EepromChip;
        unsigned short offset = 0;
        unsigned short ntimers;
                                     unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short tmp;
                                     unsigned long iobase,
                                     unsigned short addr)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        struct addi_private *devpriv = dev->private;
        char *type = this_board->pc_EepromChip;
        unsigned short offset;
 static void addi_eeprom_read_info(struct comedi_device *dev,
                                  unsigned long iobase)
 {
-       const struct addi_board *this_board = comedi_board(dev);
+       const struct addi_board *this_board = dev->board_ptr;
        char *type = this_board->pc_EepromChip;
        unsigned short size;
        unsigned char nfuncs;