Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: ni_pcidio: remove this_board macro 



This macro relies on a local variable having a specific name and
derives a pointer from that local variable.

It's only used in the attach and we already have the local variable
'board' that has the same information. Use that instead.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e69e860e

drivers/staging/comedi/drivers/ni_pcidio.c

+2 −4
Original line number Diff line number Diff line
@@ -304,8 +304,6 @@ static const struct nidio_board nidio_boards[] = { 
	},

};



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



struct nidio96_private {

	struct mite_struct *mite;

	int boardtype;
@@ -1112,7 +1110,7 @@ static int nidio_auto_attach(struct comedi_device *dev, 
	if (!board)

		return -ENODEV;

	dev->board_ptr = board;

	dev->board_name = this_board->name;

	dev->board_name = board->name;



	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	if (!devpriv)
@@ -1136,7 +1134,7 @@ static int nidio_auto_attach(struct comedi_device *dev, 
		return -ENOMEM;



	irq = mite_irq(devpriv->mite);

	if (this_board->uses_firmware) {

	if (board->uses_firmware) {

		ret = pci_6534_upload_firmware(dev);

		if (ret < 0)

			return ret;