staging: comedi: cb_pcidas: tidy up memory subdevice init
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 14 Oct 2015 00:47:56 +0000 (17:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Oct 2015 06:20:10 +0000 (23:20 -0700)
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>
drivers/staging/comedi/drivers/cb_pcidas.c

index f34a615df841d9cd89dc4efb0f3f6f65f2076486..3238cabca7acae15810af21da6199eb3972b63c1 100644 (file)
@@ -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];