From 34e980be04f6b3ecd259d06f70a2682d53c0aaf8 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 22 May 2012 17:59:07 -0700 Subject: [PATCH] --- yaml --- r: 317079 b: refs/heads/master c: 354c00a67697fc7a56b540647ef7fe93333ed903 h: refs/heads/master i: 317077: 7eddc1604bab601a870a3f98c67d339227cbd0df 317075: 87811120fb8752930ca729e4d7a2a85aa2498ad3 317071: 1e7c23d93bea42b0ebdcad4b2fd42d1068431e57 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rti800.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cca5acb09126..7e092877f904 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 609dd342fb7eab79d42350455c2d86238c7dc15f +refs/heads/master: 354c00a67697fc7a56b540647ef7fe93333ed903 diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c index f0eb52a77881..04a23687ae3e 100644 --- a/trunk/drivers/staging/comedi/drivers/rti800.c +++ b/trunk/drivers/staging/comedi/drivers/rti800.c @@ -138,8 +138,6 @@ struct rti800_board { int has_ao; }; -#define this_board ((const struct rti800_board *)dev->board_ptr) - static irqreturn_t rti800_interrupt(int irq, void *dev); struct rti800_private { @@ -309,6 +307,7 @@ static int rti800_do_insn_bits(struct comedi_device *dev, static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + const struct rti800_board *board = comedi_board(dev); unsigned int irq; unsigned long iobase; int ret; @@ -347,7 +346,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) printk(KERN_INFO "( no irq )\n"); } - dev->board_name = this_board->name; + dev->board_name = board->name; ret = alloc_subdevices(dev, 4); if (ret < 0) @@ -386,7 +385,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) } s++; - if (this_board->has_ao) { + if (board->has_ao) { /* ao subdevice (only on rti815) */ s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE;