malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-03-24 12:17:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: remove this_board macro in the acl7225b 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 15:31:41 -07:00 committed by Greg Kroah-Hartman
parent b13ff04654
commit 960ca1ae1e
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/acl7225b.c
View File

@ -27,8 +27,6 @@ struct boardtype {
int io_range; /* len of I/O space */
};
#define this_board ((const struct boardtype *)dev->board_ptr)
static int acl7225b_do_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
@ -67,19 +65,20 @@ static int acl7225b_di_insn(struct comedi_device *dev,
static int acl7225b_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct boardtype *board = comedi_board(dev);
struct comedi_subdevice *s;
int iobase, iorange;
iobase = it->options[0];
iorange = this_board->io_range;
iorange = board->io_range;
printk(KERN_INFO "comedi%d: acl7225b: board=%s 0x%04x\n", dev->minor,
this_board->name, iobase);
board->name, iobase);
if (!request_region(iobase, iorange, "acl7225b")) {
printk(KERN_ERR "comedi%d: request_region failed - I/O port conflict\n",
dev->minor);
return -EIO;
}
dev->board_name = this_board->name;
dev->board_name = board->name;
dev->iobase = iobase;
dev->irq = 0;
@ -121,8 +120,10 @@ static int acl7225b_attach(struct comedi_device *dev,
static void acl7225b_detach(struct comedi_device *dev)
{
const struct boardtype *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 boardtype boardtypes[] = {