From: H Hartley Sweeten Date: Wed, 18 Sep 2013 18:50:54 +0000 (-0700) Subject: staging: comedi: adl_pci6208: tidy up pci6208_ao_rinsn() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c354fe06cf04481273f3fee8c5424d0665267d80;p=deliverable%2Flinux.git staging: comedi: adl_pci6208: tidy up pci6208_ao_rinsn() For aesthetics, rename this function to help with greps, Change the type of 'chan' to match the type of the insn->chanspec that it is derived from using the CR_CHAN macro. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c index 737f91a60a14..26f1c2523694 100644 --- a/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/drivers/staging/comedi/drivers/adl_pci6208.c @@ -126,12 +126,13 @@ static int pci6208_ao_insn_write(struct comedi_device *dev, return insn->n; } -static int pci6208_ao_rinsn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int pci6208_ao_insn_read(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct pci6208_private *devpriv = dev->private; - int chan = CR_CHAN(insn->chanspec); + unsigned int chan = CR_CHAN(insn->chanspec); int i; for (i = 0; i < insn->n; i++) @@ -206,7 +207,7 @@ static int pci6208_auto_attach(struct comedi_device *dev, s->maxdata = 0xffff; s->range_table = &range_bipolar10; s->insn_write = pci6208_ao_insn_write; - s->insn_read = pci6208_ao_rinsn; + s->insn_read = pci6208_ao_insn_read; s = &dev->subdevices[1]; /* digital input subdevice */