aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChihau Chau <chihau@gmail.com>2010-02-04 20:27:05 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-04 10:59:00 -0500
commit52d83bde6f10480268c454b3373bfcec8c2e3c3e (patch)
tree4f047fb75862ac5926c8a27bc4e4efb0abb0b567
parent60b341b778cc2929df16c0a504c91621b3c6a4ad (diff)
Staging: comedi: poc: fix coding style issues
This fixes a line over 80 characters and a brace warnings. Signed-off-by: Chihau Chau <chihau@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/poc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index d23e588d063..28eba6d3cb5 100644
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -136,8 +136,8 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
136 /* check if io addresses are available */ 136 /* check if io addresses are available */
137 if (!request_region(iobase, iosize, "dac02")) { 137 if (!request_region(iobase, iosize, "dac02")) {
138 printk 138 printk
139 ("I/O port conflict: failed to allocate ports 0x%lx to 0x%lx\n", 139 ("I/O port conflict: failed to allocate ports 0x%lx to "
140 iobase, iobase + iosize - 1); 140 "0x%lx\n", iobase, iobase + iosize - 1);
141 return -EIO; 141 return -EIO;
142 } 142 }
143 dev->iobase = iobase; 143 dev->iobase = iobase;
@@ -156,9 +156,8 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
156 s->insn_write = this_board->winsn; 156 s->insn_write = this_board->winsn;
157 s->insn_read = this_board->rinsn; 157 s->insn_read = this_board->rinsn;
158 s->insn_bits = this_board->insnbits; 158 s->insn_bits = this_board->insnbits;
159 if (s->type == COMEDI_SUBD_AO || s->type == COMEDI_SUBD_DO) { 159 if (s->type == COMEDI_SUBD_AO || s->type == COMEDI_SUBD_DO)
160 s->subdev_flags = SDF_WRITABLE; 160 s->subdev_flags = SDF_WRITABLE;
161 }
162 161
163 return 0; 162 return 0;
164} 163}