diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-10-13 17:47:56 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-16 23:20:10 -0700 |
| commit | 73d38effd10b8e399790aa67d6eace855f2d81ce (patch) | |
| tree | bd4fd9416be8441cf63adb3498e898f16991d5a4 /drivers/staging/comedi/drivers/cb_pcidas.c | |
| parent | staging: comedi: cb_pcidas: tidy up 8800 caldac calibration subdevice (diff) | |
| download | linux-dev-73d38effd10b8e399790aa67d6eace855f2d81ce.tar.xz linux-dev-73d38effd10b8e399790aa67d6eace855f2d81ce.zip | |
staging: comedi: cb_pcidas: tidy up memory subdevice init
For aesthetics, add some whitespace to the initialization of this
subdevice.
Rename the (*insn_read) function so it has namespace associated with
the driver.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/cb_pcidas.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index f34a615df841..3238cabca7ac 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -506,9 +506,10 @@ static int nvram_read(struct comedi_device *dev, unsigned int address, return 0; } -static int eeprom_read_insn(struct comedi_device *dev, - struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int cb_pcidas_eeprom_insn_read(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { u8 nvram_data; int retval; @@ -1357,13 +1358,13 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, if (ret) return ret; - /* serial EEPROM, */ + /* Memory subdevice - serial EEPROM */ s = &dev->subdevices[3]; - s->type = COMEDI_SUBD_MEMORY; - s->subdev_flags = SDF_READABLE | SDF_INTERNAL; - s->n_chan = 256; - s->maxdata = 0xff; - s->insn_read = eeprom_read_insn; + s->type = COMEDI_SUBD_MEMORY; + s->subdev_flags = SDF_READABLE | SDF_INTERNAL; + s->n_chan = 256; + s->maxdata = 0xff; + s->insn_read = cb_pcidas_eeprom_insn_read; /* Calibration subdevice - 8800 caldac */ s = &dev->subdevices[4]; |