From: H Hartley Sweeten Date: Tue, 4 Jun 2013 02:04:23 +0000 (-0700) Subject: staging: comedi: pcmda12: rename the analog output (*insn_{read, write}) functions X-Git-Tag: MMI-PSA29.97-13-9~14152^2~280 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b11c5d3ccc7361dc552f689f08b38599fea5a513;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: comedi: pcmda12: rename the analog output (*insn_{read, write}) functions For aesthetic reasons. rename these functions so they have namespace associated with the driver. Also remove the unnecessary '&' when setting the callbacks. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index c725a9b0982e..5926363cabf5 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c @@ -84,8 +84,10 @@ static void zero_chans(struct comedi_device *dev) inb(LSB_PORT(0)); /* update chans. */ } -static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int pcmda12_ao_insn_write(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct pcmda12_private *devpriv = dev->private; int i; @@ -127,8 +129,10 @@ static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, DAC outputs, which makes all AO channels update simultaneously. This is useful for some control applications, I would imagine. */ -static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int pcmda12_ao_insn_read(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct pcmda12_private *devpriv = dev->private; int i; @@ -172,8 +176,8 @@ static int pcmda12_attach(struct comedi_device *dev, s->n_chan = CHANS; s->maxdata = 0x0fff; s->range_table = &pcmda12_ranges; - s->insn_write = &ao_winsn; - s->insn_read = &ao_rinsn; + s->insn_write = pcmda12_ao_insn_write; + s->insn_read = pcmda12_ao_insn_read; zero_chans(dev); /* clear out all the registers, basically */