Commit 6f929aeb authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: remove this_board macro in the pcl730 driver

The 'this_board' macro depends on having a local variable with
a magic name. The CodingStyle document suggests not doing this
to avoid confusion. Remove the macro and use the comedi_board()
inline helper to get the dev->board_ptr information.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3cb08e08
...@@ -32,8 +32,6 @@ struct pcl730_board { ...@@ -32,8 +32,6 @@ struct pcl730_board {
unsigned int io_range; /* len of I/O space */ unsigned int io_range; /* len of I/O space */
}; };
#define this_board ((const struct pcl730_board *)dev->board_ptr)
static int pcl730_do_insn(struct comedi_device *dev, struct comedi_subdevice *s, static int pcl730_do_insn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
...@@ -70,19 +68,20 @@ static int pcl730_di_insn(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -70,19 +68,20 @@ static int pcl730_di_insn(struct comedi_device *dev, struct comedi_subdevice *s,
static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
const struct pcl730_board *board = comedi_board(dev);
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned long iobase; unsigned long iobase;
unsigned int iorange; unsigned int iorange;
iobase = it->options[0]; iobase = it->options[0];
iorange = this_board->io_range; iorange = board->io_range;
printk(KERN_INFO "comedi%d: pcl730: board=%s 0x%04lx ", dev->minor, printk(KERN_INFO "comedi%d: pcl730: board=%s 0x%04lx ", dev->minor,
this_board->name, iobase); board->name, iobase);
if (!request_region(iobase, iorange, "pcl730")) { if (!request_region(iobase, iorange, "pcl730")) {
printk("I/O port conflict\n"); printk("I/O port conflict\n");
return -EIO; return -EIO;
} }
dev->board_name = this_board->name; dev->board_name = board->name;
dev->iobase = iobase; dev->iobase = iobase;
dev->irq = 0; dev->irq = 0;
...@@ -136,8 +135,10 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -136,8 +135,10 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void pcl730_detach(struct comedi_device *dev) static void pcl730_detach(struct comedi_device *dev)
{ {
const struct pcl730_board *board = comedi_board(dev);
if (dev->iobase) if (dev->iobase)
release_region(dev->iobase, this_board->io_range); release_region(dev->iobase, board->io_range);
} }
static const struct pcl730_board boardtypes[] = { static const struct pcl730_board boardtypes[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment