From 6734b09a2f3db5c5782b77c15b69ca80a4951004 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 22 May 2012 15:51:14 -0700 Subject: [PATCH] --- yaml --- r: 317101 b: refs/heads/master c: b74055465ce47c75b3ebf667c2ff0661828d7a11 h: refs/heads/master i: 317099: a6194edfa29d7940275662316fd7c909eae52236 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/aio_iiro_16.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a4066155e25a..60410f19c7bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf4683bdbdfafc02f5f4d3170efcd25ff9f00c6b +refs/heads/master: b74055465ce47c75b3ebf667c2ff0661828d7a11 diff --git a/trunk/drivers/staging/comedi/drivers/aio_iiro_16.c b/trunk/drivers/staging/comedi/drivers/aio_iiro_16.c index 04f6f94b1f47..5c1548b385f4 100644 --- a/trunk/drivers/staging/comedi/drivers/aio_iiro_16.c +++ b/trunk/drivers/staging/comedi/drivers/aio_iiro_16.c @@ -57,8 +57,6 @@ static const struct aio_iiro_16_board aio_iiro_16_boards[] = { .do_ = 16}, }; -#define thisboard ((const struct aio_iiro_16_board *) dev->board_ptr) - struct aio_iiro_16_private { int data; struct pci_dev *pci_dev; @@ -106,12 +104,13 @@ static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev, static int aio_iiro_16_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + const struct aio_iiro_16_board *board = comedi_board(dev); int iobase; struct comedi_subdevice *s; printk(KERN_INFO "comedi%d: aio_iiro_16: ", dev->minor); - dev->board_name = thisboard->name; + dev->board_name = board->name; iobase = it->options[0];