Skip to content

Commit

Permalink
staging: comedi: remove thisboard macro in the das16m1 driver
Browse files Browse the repository at this point in the history
The 'thisboard' 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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent df9d334 commit 4c354b4
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/staging/comedi/drivers/das16m1.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ struct das16m1_private_struct {
unsigned int divisor2; /* divides master clock to obtain conversion speed */
};
#define devpriv ((struct das16m1_private_struct *)(dev->private))
#define thisboard ((const struct das16m1_board *)(dev->board_ptr))

static inline short munge_sample(short data)
{
Expand All @@ -168,6 +167,7 @@ static void munge_sample_array(short *array, unsigned int num_elements)
static int das16m1_cmd_test(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
const struct das16m1_board *board = comedi_board(dev);
unsigned int err = 0, tmp, i;

/* make sure triggers are valid */
Expand Down Expand Up @@ -225,8 +225,8 @@ static int das16m1_cmd_test(struct comedi_device *dev,
}

if (cmd->convert_src == TRIG_TIMER) {
if (cmd->convert_arg < thisboard->ai_speed) {
cmd->convert_arg = thisboard->ai_speed;
if (cmd->convert_arg < board->ai_speed) {
cmd->convert_arg = board->ai_speed;
err++;
}
}
Expand Down Expand Up @@ -600,6 +600,7 @@ static int das16m1_irq_bits(unsigned int irq)
static int das16m1_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct das16m1_board *board = comedi_board(dev);
struct comedi_subdevice *s;
int ret;
unsigned int irq;
Expand All @@ -611,7 +612,7 @@ static int das16m1_attach(struct comedi_device *dev,
if (ret < 0)
return ret;

dev->board_name = thisboard->name;
dev->board_name = board->name;

if (!request_region(iobase, DAS16M1_SIZE, dev->driver->driver_name)) {
comedi_error(dev, "I/O port conflict\n");
Expand Down

0 comments on commit 4c354b4

Please sign in to comment.