lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: fix brace and 80 character coding style issue in ni_daq_700.c

Browse Source 
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>
This commit is contained in:
Graham M Howe
2010-02-15 10:04:26 +00:00
committed by Greg Kroah-Hartman
parent 3c2aabc41d
commit 9a16a92c11
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/comedi/drivers/ni_daq_700.c
View File

@@ -76,13 +76,15 @@ struct dio700_board {
static const struct dio700_board dio700_boards[] = { static const struct dio700_board dio700_boards[] = {
{ {
.name = "daqcard-700", .name = "daqcard-700",
.device_id = 0x4743, /* 0x10b is manufacturer id, 0x4743 is device id */ /* 0x10b is manufacturer id, 0x4743 is device id */
.device_id = 0x4743,
.bustype = pcmcia_bustype, .bustype = pcmcia_bustype,
.have_dio = 1, .have_dio = 1,
}, },
{ {
.name = "ni_daq_700", .name = "ni_daq_700",
.device_id = 0x4743, /* 0x10b is manufacturer id, 0x4743 is device id */ /* 0x10b is manufacturer id, 0x4743 is device id */
.device_id = 0x4743,
.bustype = pcmcia_bustype, .bustype = pcmcia_bustype,
.have_dio = 1, .have_dio = 1,
}, },
@@ -309,11 +311,11 @@ int subdev_700_init(struct comedi_device *dev, struct comedi_subdevice *s,
return -ENOMEM; return -ENOMEM;
CALLBACK_ARG = arg; CALLBACK_ARG = arg;
if (cb == NULL) { if (cb == NULL)
CALLBACK_FUNC = subdev_700_cb; CALLBACK_FUNC = subdev_700_cb;
} else { else
CALLBACK_FUNC = cb; CALLBACK_FUNC = cb;
}
s->insn_bits = subdev_700_insn; s->insn_bits = subdev_700_insn;
s->insn_config = subdev_700_insn_config; s->insn_config = subdev_700_insn_config;
@@ -345,12 +347,10 @@ int subdev_700_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
void subdev_700_cleanup(struct comedi_device *dev, struct comedi_subdevice *s) void subdev_700_cleanup(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
if (s->private) { if (s->private)
if (subdevpriv->have_irq) { if (subdevpriv->have_irq)
}
kfree(s->private); kfree(s->private);
}
} }
EXPORT_SYMBOL(subdev_700_init); EXPORT_SYMBOL(subdev_700_init);
@@ -390,9 +390,9 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
printk("comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor, printk("comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor,
thisboard->name, iobase); thisboard->name, iobase);
#ifdef incomplete #ifdef incomplete
if (irq) { if (irq)
printk(", irq %u", irq); printk(", irq %u", irq);
}
#endif #endif
printk("\n"); printk("\n");