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

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

staging: comedi: icp_multi: remove 'valid' member from private data 



This member is set at the end of the driver attach and is only used to
verify that icp_multi_reset() can be called in the (*detach). The only
requirement for icp_multi_reset() to work is that the dev->mmio is valid.

Remove the 'valid' member from the private data and use 'dev->mmio' to
see if the reset can be done.

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 6ab5db9c

drivers/staging/comedi/drivers/icp_multi.c

+2 −8
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static const char range_codes_analog[] = { 0x00, 0x20, 0x10, 0x30 }; 
*/



struct icp_multi_private {

	char valid;		/*  card is usable */

	unsigned int AdcCmdStatus;	/*  ADC Command/Status register */

	unsigned int DacCmdStatus;	/*  DAC Command/Status register */

	unsigned int IntEnable;	/*  Interrupt Enable register */
@@ -530,17 +529,12 @@ static int icp_multi_auto_attach(struct comedi_device *dev, 
	s->insn_read = icp_multi_insn_read_ctr;

	s->insn_write = icp_multi_insn_write_ctr;



	devpriv->valid = 1;



	return 0;

}



static void icp_multi_detach(struct comedi_device *dev)

{

	struct icp_multi_private *devpriv = dev->private;



	if (devpriv)

		if (devpriv->valid)

	if (dev->mmio)

		icp_multi_reset(dev);

	comedi_pci_detach(dev);

}