staging: comedi: jr3_pci: re-work firmware copyright display

If debug messages are enabled, the card initialization done in
`jr3_pci_auto_attach()` spits out 24 (0x18) debug messages to show the
null-terminated copyright string embedded in the firmware, one character
at a time, including the ASCII NUL characters at the end.  Factor out
the copyright display into a new function `jr3_pci_show_copyright()` and
re-work it to copy the whole copyright string into a buffer, so that it
can be shown with a single debug message.

Incidentally, this also removes a checkpatch warning "Avoid multiple
line dereference" in the original code.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index d800a5e113abc8292056d88dd587fe563604dffe..69ed84a385e36f37b8b7090da52ef989e24a83b5 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -679,6 +679,19 @@ jr3_pci_alloc_spriv(struct comedi_device *dev, struct comedi_subdevice *s)
        return spriv;
 }
 
+static void jr3_pci_show_copyright(struct comedi_device *dev)
+{
+       struct jr3_pci_dev_private *devpriv = dev->private;
+       struct jr3_channel __iomem *ch0data = &devpriv->iobase->channel[0].data;
+       char copy[ARRAY_SIZE(ch0data->copyright) + 1];
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(ch0data->copyright); i++)
+               copy[i] = (char)(get_u16(&ch0data->copyright[i]) >> 8);
+       copy[i] = '\0';
+       dev_dbg(dev->class_dev, "Firmware copyright: %s\n", copy);
+}
+
 static int jr3_pci_auto_attach(struct comedi_device *dev,
                               unsigned long context)
 {
@@ -762,11 +775,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
         * can read firmware version
         */
        msleep_interruptible(25);
-       for (i = 0; i < 0x18; i++) {
-               dev_dbg(dev->class_dev, "%c\n",
-                       get_u16(&devpriv->iobase->channel[0].
-                               data.copyright[i]) >> 8);
-       }
+       jr3_pci_show_copyright(dev);
 
        /* Start card timer */
        for (i = 0; i < dev->n_subdevices; i++) {