Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 53fa8c46881a5a500fdcc4cf86359d92211b1e9b

Authored by Güngör Erseymen
Committed by Greg Kroah-Hartman
1 parent 3cf05ddb0d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Staging: comedi: ssv_dnp: fix checkpatch.pl warning 

Fix checkpatch.pl warning about printk issue by merging two printk
calls into one dev_info call.

Signed-off-by: Güngör Erseymen <gelurine@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 4 deletions Side-by-side Diff

drivers/staging/comedi/drivers/ssv_dnp.c
Diff comments   View file @ 53fa8c4
... ... @@ -177,8 +177,6 @@
177 177 struct comedi_subdevice *s;
178 178 int ret;
179 179  
180   - printk(KERN_INFO "comedi%d: dnp: ", dev->minor);
181   -
182 180 dev->board_name = board->name;
183 181  
184 182 ret = comedi_alloc_subdevices(dev, 1);
... ... @@ -195,8 +193,6 @@
195 193 s->insn_bits = dnp_dio_insn_bits;
196 194 s->insn_config = dnp_dio_insn_config;
197 195  
198   - printk("attached\n");
199   -
200 196 /* We use the I/O ports 0x22,0x23 and 0xa3-0xa9, which are always
201 197 * allocated for the primary 8259, so we don't need to allocate them
202 198 * ourselves. */
... ... @@ -209,6 +205,7 @@
209 205 outb(PCMR, CSCIR);
210 206 outb((inb(CSCDR) & 0xAA), CSCDR);
211 207  
  208 + dev_info(dev->class_dev, "%s: attached\n", dev->board_name);
212 209 return 1;
213 210 }
214 211