From: H Hartley Sweeten Date: Wed, 18 Sep 2013 18:50:35 +0000 (-0700) Subject: staging: comedi: adl_pci6208: tidy up pci6208_ao_winsn() X-Git-Tag: MMI-PSA29.97-13-9~13364^2~688 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a99a29437080eb85f15bc6744150885ee01c1505;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: comedi: adl_pci6208: tidy up pci6208_ao_winsn() 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 db808733f2f5..737f91a60a14 100644 --- a/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/drivers/staging/comedi/drivers/adl_pci6208.c @@ -98,12 +98,13 @@ static int pci6208_ao_wait_for_data_send(struct comedi_device *dev, return -ETIME; } -static int pci6208_ao_winsn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int pci6208_ao_insn_write(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); unsigned int val = devpriv->ao_readback[chan]; int ret; int i; @@ -204,7 +205,7 @@ static int pci6208_auto_attach(struct comedi_device *dev, s->n_chan = boardinfo->ao_chans; s->maxdata = 0xffff; s->range_table = &range_bipolar10; - s->insn_write = pci6208_ao_winsn; + s->insn_write = pci6208_ao_insn_write; s->insn_read = pci6208_ao_rinsn; s = &dev->subdevices[1];