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: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 69ed84a385e36f37b8b7090da52ef989e24a83b5..500ec50d26bf102a3f628b4ba196b8e45ca52a88 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -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,9 +306,8 @@ 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);
+               dev_dbg(dev->class_dev, "serial: %p %d (%d)\n",
+                       spriv, spriv->serial_no, s->index);
        }
        return 0;
 }
@@ -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);