Commit 06131969 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: remove this_board macro in the dt282x 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 75b9ad9e

drivers/staging/comedi/drivers/dt282x.c

+8 −7
Original line number Diff line number Diff line
@@ -221,8 +221,6 @@ struct dt282x_board { 
	int dabits;

};



#define this_board ((const struct dt282x_board *)dev->board_ptr)



struct dt282x_private {

	int ad_2scomp;		/* we have 2's comp jumper set  */

	int da0_2scomp;		/* same, for DAC0               */
@@ -580,6 +578,7 @@ static int dt282x_ai_insn_read(struct comedi_device *dev, 
static int dt282x_ai_cmdtest(struct comedi_device *dev,

			     struct comedi_subdevice *s, struct comedi_cmd *cmd)

{

	const struct dt282x_board *board = comedi_board(dev);

	int err = 0;

	int tmp;
@@ -658,8 +657,8 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev, 
		cmd->convert_arg = SLOWEST_TIMER;

		err++;

	}

	if (cmd->convert_arg < this_board->ai_speed) {

		cmd->convert_arg = this_board->ai_speed;

	if (cmd->convert_arg < board->ai_speed) {

		cmd->convert_arg = board->ai_speed;

		err++;

	}

	if (cmd->scan_end_arg != cmd->chanlist_len) {
@@ -694,6 +693,7 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev, 


static int dt282x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

{

	const struct dt282x_board *board = comedi_board(dev);

	struct comedi_cmd *cmd = &s->async->cmd;

	int timer;
@@ -706,8 +706,8 @@ static int dt282x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 


	dt282x_disable_dma(dev);



	if (cmd->convert_arg < this_board->ai_speed)

		cmd->convert_arg = this_board->ai_speed;

	if (cmd->convert_arg < board->ai_speed)

		cmd->convert_arg = board->ai_speed;

	timer = dt282x_ns_to_timer(&cmd->convert_arg, TRIG_ROUND_NEAREST);

	outw(timer, dev->iobase + DT2821_TMRCTR);
@@ -1176,12 +1176,13 @@ static int dt282x_grab_dma(struct comedi_device *dev, int dma1, int dma2) 
 */

static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it)

{

	const struct dt282x_board *board = comedi_board(dev);

	int i, irq;

	int ret;

	struct comedi_subdevice *s;

	unsigned long iobase;



	dev->board_name = this_board->name;

	dev->board_name = board->name;



	iobase = it->options[opt_iobase];

	if (!iobase)