evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: s626: use dev->read_subdev

Browse source 
Use the dev->read_subdev that was setup in the device attach instead
of accessing the dev->subdevices array directly.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-12-05 13:43:39 -07:00 • committed by Greg Kroah-Hartman
parent 1580994f6c
commit 9c9ab3c1a4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/s626.c
View file

@ -1614,12 +1614,13 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl) static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
{ {
struct s626_private *devpriv = dev->private; struct s626_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->read_subdev;
struct comedi_cmd *cmd = &s->async->cmd;
uint32_t *rps; uint32_t *rps;
uint32_t jmp_adrs; uint32_t jmp_adrs;
uint16_t i; uint16_t i;
uint16_t n; uint16_t n;
uint32_t local_ppl; uint32_t local_ppl;
struct comedi_cmd *cmd = &dev->subdevices->async->cmd;
/* Stop RPS program in case it is currently running */ /* Stop RPS program in case it is currently running */
s626_mc_disable(dev, S626_MC1_ERPS1, S626_P_MC1); s626_mc_disable(dev, S626_MC1_ERPS1, S626_P_MC1);
@ -2639,6 +2640,7 @@ static void s626_initialize(struct comedi_device *dev)
* a defined state after a PCI reset. * a defined state after a PCI reset.
*/ */
{ {
struct comedi_subdevice *s = dev->read_subdev;
uint8_t poll_list; uint8_t poll_list;
uint16_t adc_data; uint16_t adc_data;
uint16_t start_val; uint16_t start_val;
@ -2650,7 +2652,7 @@ static void s626_initialize(struct comedi_device *dev)
s626_reset_adc(dev, &poll_list); s626_reset_adc(dev, &poll_list);
/* Get initial ADC value */ /* Get initial ADC value */
s626_ai_rinsn(dev, dev->subdevices, NULL, data); s626_ai_rinsn(dev, s, NULL, data);
start_val = data[0]; start_val = data[0];
/* /*
@ -2664,7 +2666,7 @@ static void s626_initialize(struct comedi_device *dev)
* being unusually quiet or at the rail. * being unusually quiet or at the rail.
*/ */
for (index = 0; index < 500; index++) { for (index = 0; index < 500; index++) {
s626_ai_rinsn(dev, dev->subdevices, NULL, data); s626_ai_rinsn(dev, s, NULL, data);
adc_data = data[0]; adc_data = data[0];
if (adc_data != start_val) if (adc_data != start_val)
break; break;