Commit 354c00a6 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 rti800 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 609dd342

drivers/staging/comedi/drivers/rti800.c

+3 −4
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ struct rti800_board { 
	int has_ao;

};



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



static irqreturn_t rti800_interrupt(int irq, void *dev);



struct rti800_private {
@@ -309,6 +307,7 @@ static int rti800_do_insn_bits(struct comedi_device *dev, 


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

{

	const struct rti800_board *board = comedi_board(dev);

	unsigned int irq;

	unsigned long iobase;

	int ret;
@@ -347,7 +346,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		printk(KERN_INFO "( no irq )\n");

	}



	dev->board_name = this_board->name;

	dev->board_name = board->name;



	ret = alloc_subdevices(dev, 4);

	if (ret < 0)
@@ -386,7 +385,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	}



	s++;

	if (this_board->has_ao) {

	if (board->has_ao) {

		/* ao subdevice (only on rti815) */

		s->type = COMEDI_SUBD_AO;

		s->subdev_flags = SDF_WRITABLE;