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

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

staging: comedi: ni_mio_common: tidy up ni_8255_callback() 



The 8255 driver (*io) callback now includes the comedi_device pointer.

Instead of passing the (cast) pointer to subdev_8255_init(), pass the
'iobase' of the 8255 registers (Port_A).

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

drivers/staging/comedi/drivers/ni_mio_common.c

+5 −8
Original line number Diff line number Diff line
@@ -4176,17 +4176,15 @@ static int ni_freq_out_insn_config(struct comedi_device *dev, 
	return insn->n;

}



static int ni_8255_callback(struct comedi_device *cdev,

			    int dir, int port, int data, unsigned long arg)

static int ni_8255_callback(struct comedi_device *dev,

			    int dir, int port, int data, unsigned long iobase)

{

	struct comedi_device *dev = (struct comedi_device *)arg;



	if (dir) {

		ni_writeb(dev, data, Port_A + 2 * port);

		ni_writeb(dev, data, iobase + 2 * port);

		return 0;

	}



	return ni_readb(dev, Port_A + 2 * port);

	return ni_readb(dev, iobase + 2 * port);

}



static int ni_get_pwm_config(struct comedi_device *dev, unsigned int *data)
@@ -5561,8 +5559,7 @@ static int ni_E_init(struct comedi_device *dev, 
	/* 8255 device */

	s = &dev->subdevices[NI_8255_DIO_SUBDEV];

	if (board->has_8255) {

		ret = subdev_8255_init(dev, s, ni_8255_callback,

				       (unsigned long)dev);

		ret = subdev_8255_init(dev, s, ni_8255_callback, Port_A);

		if (ret)

			return ret;

	} else {