Commit 67aa069d authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: jr3_pci: remove unneeded 'spriv' checks 



If `jr3_pci_auto_attach()` returns with no error, we can now be sure
that the COMEDI subdevice private data structures have been allocated.
Remove the tests for a valid pointer to the private data structure in
`jr3_pci_ai_insn_read()`, `jr3_pci_open()`, and
`jr3_pci_poll_subdevice()`, since they will not be called if the pointer
is invalid.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 048ad49a

drivers/staging/comedi/drivers/jr3_pci.c

+2 −9
Original line number Diff line number Diff line
@@ -279,9 +279,6 @@ static int jr3_pci_ai_insn_read(struct comedi_device *dev, 
	u16 errors;

	int i;



	if (!spriv)

		return -EINVAL;



	errors = get_u16(&spriv->channel->errors);

	if (spriv->state != state_jr3_done ||

	    (errors & (watch_dog | watch_dog2 | sensor_change))) {
@@ -309,7 +306,6 @@ static int jr3_pci_open(struct comedi_device *dev) 
	for (i = 0; i < dev->n_subdevices; i++) {

		s = &dev->subdevices[i];

		spriv = s->private;

		if (spriv)

		dev_dbg(dev->class_dev, "serial: %p %d (%d)\n",

			spriv, spriv->serial_no, s->index);

	}
@@ -459,9 +455,6 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s) 
	int errors;

	int i;



	if (!spriv)

		return result;



	channel = spriv->channel;

	errors = get_u16(&channel->errors);