Commit d6ae5062 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: jr3_pci: remove 'channel_no' from subdevice private data

This member of the subdevice private data is just the subdevice 'index'. Use
that instead and remove the member.
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 da1331a5
...@@ -111,7 +111,6 @@ struct jr3_pci_subdev_private { ...@@ -111,7 +111,6 @@ struct jr3_pci_subdev_private {
state_jr3_init_use_offset_complete, state_jr3_init_use_offset_complete,
state_jr3_done state_jr3_done
} state; } state;
int channel_no;
int serial_no; int serial_no;
int model_no; int model_no;
struct { struct {
...@@ -311,7 +310,7 @@ static int jr3_pci_open(struct comedi_device *dev) ...@@ -311,7 +310,7 @@ static int jr3_pci_open(struct comedi_device *dev)
spriv = s->private; spriv = s->private;
if (spriv) if (spriv)
dev_dbg(dev->class_dev, "serial: %p %d (%d)\n", dev_dbg(dev->class_dev, "serial: %p %d (%d)\n",
spriv, spriv->serial_no, spriv->channel_no); spriv, spriv->serial_no, s->index);
} }
return 0; return 0;
} }
...@@ -646,7 +645,6 @@ jr3_pci_alloc_spriv(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -646,7 +645,6 @@ jr3_pci_alloc_spriv(struct comedi_device *dev, struct comedi_subdevice *s)
return NULL; return NULL;
spriv->channel = &devpriv->iobase->channel[s->index].data; spriv->channel = &devpriv->iobase->channel[s->index].data;
spriv->channel_no = s->index;
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
spriv->range[j].length = 1; spriv->range[j].length = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment