unsigned int range,
                                       unsigned int aref)
 {
-       const struct labpc_boardinfo *board = comedi_board(dev);
+       const struct labpc_boardinfo *board = dev->board_ptr;
        struct labpc_private *devpriv = dev->private;
 
        if (board->is_labpc1200) {
                                 unsigned int aref,
                                 bool ena_intr)
 {
-       const struct labpc_boardinfo *board = comedi_board(dev);
+       const struct labpc_boardinfo *board = dev->board_ptr;
        struct labpc_private *devpriv = dev->private;
 
        if (!board->is_labpc1200)
 static int labpc_ai_cmdtest(struct comedi_device *dev,
                            struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
-       const struct labpc_boardinfo *board = comedi_board(dev);
+       const struct labpc_boardinfo *board = dev->board_ptr;
        int err = 0;
        int tmp, tmp2;
        unsigned int stop_mask;
 
 static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-       const struct labpc_boardinfo *board = comedi_board(dev);
+       const struct labpc_boardinfo *board = dev->board_ptr;
        struct labpc_private *devpriv = dev->private;
        struct comedi_async *async = s->async;
        struct comedi_cmd *cmd = &async->cmd;
 static irqreturn_t labpc_interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
-       const struct labpc_boardinfo *board = comedi_board(dev);
+       const struct labpc_boardinfo *board = dev->board_ptr;
        struct labpc_private *devpriv = dev->private;
        struct comedi_subdevice *s = dev->read_subdev;
        struct comedi_async *async;
                               struct comedi_insn *insn,
                               unsigned int *data)
 {
-       const struct labpc_boardinfo *board = comedi_board(dev);
+       const struct labpc_boardinfo *board = dev->board_ptr;
        struct labpc_private *devpriv = dev->private;
        int channel, range;
        unsigned long flags;
 int labpc_common_attach(struct comedi_device *dev,
                        unsigned int irq, unsigned long isr_flags)
 {
-       const struct labpc_boardinfo *board = comedi_board(dev);
+       const struct labpc_boardinfo *board = dev->board_ptr;
        struct labpc_private *devpriv = dev->private;
        struct comedi_subdevice *s;
        int ret;