aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham M Howe <gman.1352@googlemail.com>2010-02-15 05:04:26 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 19:43:02 -0500
commit9a16a92c11e82a0a80b4847343cfb8b5c54ed6b6 (patch)
tree6e737ce4ae1421610c775529d62a043c510e9b37
parent3c2aabc41da7e9f957bc826363115a54764fb396 (diff)
Staging: comedi: fix brace and 80 character coding style issue in ni_daq_700.c
This is a patch to the ni_daq_700.c file that fixes up brace and 80 character warnings found by the checkpatch.pl tool Signed-off-by: Graham M Howe <gman.1352@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index ef5e1183d47d..c9b0395a6103 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -76,13 +76,15 @@ struct dio700_board {
76static const struct dio700_board dio700_boards[] = { 76static const struct dio700_board dio700_boards[] = {
77 { 77 {
78 .name = "daqcard-700", 78 .name = "daqcard-700",
79 .device_id = 0x4743, /* 0x10b is manufacturer id, 0x4743 is device id */ 79 /* 0x10b is manufacturer id, 0x4743 is device id */
80 .device_id = 0x4743,
80 .bustype = pcmcia_bustype, 81 .bustype = pcmcia_bustype,
81 .have_dio = 1, 82 .have_dio = 1,
82 }, 83 },
83 { 84 {
84 .name = "ni_daq_700", 85 .name = "ni_daq_700",
85 .device_id = 0x4743, /* 0x10b is manufacturer id, 0x4743 is device id */ 86 /* 0x10b is manufacturer id, 0x4743 is device id */
87 .device_id = 0x4743,
86 .bustype = pcmcia_bustype, 88 .bustype = pcmcia_bustype,
87 .have_dio = 1, 89 .have_dio = 1,
88 }, 90 },
@@ -309,11 +311,11 @@ int subdev_700_init(struct comedi_device *dev, struct comedi_subdevice *s,
309 return -ENOMEM; 311 return -ENOMEM;
310 312
311 CALLBACK_ARG = arg; 313 CALLBACK_ARG = arg;
312 if (cb == NULL) { 314 if (cb == NULL)
313 CALLBACK_FUNC = subdev_700_cb; 315 CALLBACK_FUNC = subdev_700_cb;
314 } else { 316 else
315 CALLBACK_FUNC = cb; 317 CALLBACK_FUNC = cb;
316 } 318
317 s->insn_bits = subdev_700_insn; 319 s->insn_bits = subdev_700_insn;
318 s->insn_config = subdev_700_insn_config; 320 s->insn_config = subdev_700_insn_config;
319 321
@@ -345,12 +347,10 @@ int subdev_700_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
345 347
346void subdev_700_cleanup(struct comedi_device *dev, struct comedi_subdevice *s) 348void subdev_700_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
347{ 349{
348 if (s->private) { 350 if (s->private)
349 if (subdevpriv->have_irq) { 351 if (subdevpriv->have_irq)
350 }
351 352
352 kfree(s->private); 353 kfree(s->private);
353 }
354} 354}
355 355
356EXPORT_SYMBOL(subdev_700_init); 356EXPORT_SYMBOL(subdev_700_init);
@@ -390,9 +390,9 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
390 printk("comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor, 390 printk("comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor,
391 thisboard->name, iobase); 391 thisboard->name, iobase);
392#ifdef incomplete 392#ifdef incomplete
393 if (irq) { 393 if (irq)
394 printk(", irq %u", irq); 394 printk(", irq %u", irq);
395 } 395
396#endif 396#endif
397 397
398 printk("\n"); 398 printk("\n");