renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-11 07:04:04 +08:00
Code

staging: comedi: remove this_board macro in the pcl730 driver

Browse Source 
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-05-22 17:03:19 -07:00 committed by Greg Kroah-Hartman
parent 3cb08e08fb
commit 6f929aeb17
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/pcl730.c
View File

@ -32,8 +32,6 @@ struct pcl730_board {
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,
struct comedi_insn *insn, unsigned int *data)
{
@ -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)
{
const struct pcl730_board *board = comedi_board(dev);
struct comedi_subdevice *s;
unsigned long iobase;
unsigned int iorange;
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,
this_board->name, iobase);
board->name, iobase);
if (!request_region(iobase, iorange, "pcl730")) {
printk("I/O port conflict\n");
return -EIO;
}
dev->board_name = this_board->name;
dev->board_name = board->name;
dev->iobase = iobase;
dev->irq = 0;
@ -136,8 +135,10 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void pcl730_detach(struct comedi_device *dev)
{
const struct pcl730_board *board = comedi_board(dev);
if (dev->iobase)
release_region(dev->iobase, this_board->io_range);
release_region(dev->iobase, board->io_range);
}
static const struct pcl730_board boardtypes[] = {