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

Staging: comedi: cleanup dt2814.c

Browse Source 
This patch cleans up the dt2814.c driver file from issues found by
checkpatch.pl tool.

Signed-off-by: Felipe de Oliveira Tanus <fotanus@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Felipe de Oliveira Tanus
2010-03-10 02:03:49 -03:00
committed by Greg Kroah-Hartman
parent 8f18604e6f
commit 3f3ba29c78
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/staging/comedi/drivers/dt2814.c
View File

@@ -99,13 +99,13 @@ static int dt2814_ai_insn_read(struct comedi_device *dev,
outb(chan, dev->iobase + DT2814_CSR); outb(chan, dev->iobase + DT2814_CSR);
for (i = 0; i < DT2814_TIMEOUT; i++) { for (i = 0; i < DT2814_TIMEOUT; i++) {
status = inb(dev->iobase + DT2814_CSR); status = inb(dev->iobase + DT2814_CSR);
printk("dt2814: status: %02x\n", status); printk(KERN_INFO "dt2814: status: %02x\n", status);
udelay(10); udelay(10);
if (status & DT2814_FINISH) if (status & DT2814_FINISH)
break; break;
} }
if (i >= DT2814_TIMEOUT) { if (i >= DT2814_TIMEOUT) {
printk("dt2814: status: %02x\n", status); printk(KERN_INFO "dt2814: status: %02x\n", status);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@@ -173,7 +173,8 @@ static int dt2814_ai_cmdtest(struct comedi_device *dev,
if (err) if (err)
return 1; return 1;
/* step 2: make sure trigger sources are unique and mutually compatible */ /* step 2: make sure trigger sources are
* unique and mutually compatible */
/* note that mutual compatibility is not an issue here */ /* note that mutual compatibility is not an issue here */
if (cmd->stop_src != TRIG_TIMER && cmd->stop_src != TRIG_EXT) if (cmd->stop_src != TRIG_TIMER && cmd->stop_src != TRIG_EXT)
@@ -256,9 +257,9 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase; unsigned long iobase;
iobase = it->options[0]; iobase = it->options[0];
printk("comedi%d: dt2814: 0x%04lx ", dev->minor, iobase); printk(KERN_INFO "comedi%d: dt2814: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, DT2814_SIZE, "dt2814")) { if (!request_region(iobase, DT2814_SIZE, "dt2814")) {
printk("I/O port conflict\n"); printk(KERN_ERR "I/O port conflict\n");
return -EIO; return -EIO;
} }
dev->iobase = iobase; dev->iobase = iobase;
@@ -267,7 +268,7 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
outb(0, dev->iobase + DT2814_CSR); outb(0, dev->iobase + DT2814_CSR);
udelay(100); udelay(100);
if (inb(dev->iobase + DT2814_CSR) & DT2814_ERR) { if (inb(dev->iobase + DT2814_CSR) & DT2814_ERR) {
printk("reset error (fatal)\n"); printk(KERN_ERR "reset error (fatal)\n");
return -EIO; return -EIO;
} }
i = inb(dev->iobase + DT2814_DATA); i = inb(dev->iobase + DT2814_DATA);
@@ -286,9 +287,9 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq = probe_irq_off(irqs); irq = probe_irq_off(irqs);
restore_flags(flags); restore_flags(flags);
if (inb(dev->iobase + DT2814_CSR) & DT2814_ERR) { if (inb(dev->iobase + DT2814_CSR) & DT2814_ERR)
printk("error probing irq (bad) \n"); printk(KERN_DEBUG "error probing irq (bad)\n");
}
i = inb(dev->iobase + DT2814_DATA); i = inb(dev->iobase + DT2814_DATA);
i = inb(dev->iobase + DT2814_DATA); i = inb(dev->iobase + DT2814_DATA);
@@ -297,18 +298,18 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
dev->irq = 0; dev->irq = 0;
if (irq > 0) { if (irq > 0) {
if (request_irq(irq, dt2814_interrupt, 0, "dt2814", dev)) { if (request_irq(irq, dt2814_interrupt, 0, "dt2814", dev)) {
printk("(irq %d unavailable)\n", irq); printk(KERN_WARNING "(irq %d unavailable)\n", irq);
} else { } else {
printk("( irq = %d )\n", irq); printk(KERN_INFO "( irq = %d )\n", irq);
dev->irq = irq; dev->irq = irq;
} }
} else if (irq == 0) { } else if (irq == 0) {
printk("(no irq)\n"); printk(KERN_WARNING "(no irq)\n");
} else { } else {
#if 0 #if 0
printk("(probe returned multiple irqs--bad)\n"); printk(KERN_DEBUG "(probe returned multiple irqs--bad)\n");
#else #else
printk("(irq probe not implemented)\n"); printk(KERN_WARNING "(irq probe not implemented)\n");
#endif #endif
} }
@@ -337,14 +338,13 @@ static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int dt2814_detach(struct comedi_device *dev) static int dt2814_detach(struct comedi_device *dev)
{ {
printk("comedi%d: dt2814: remove\n", dev->minor); printk(KERN_INFO "comedi%d: dt2814: remove\n", dev->minor);
if (dev->irq) { if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
}
if (dev->iobase) { if (dev->iobase)
release_region(dev->iobase, DT2814_SIZE); release_region(dev->iobase, DT2814_SIZE);
}
return 0; return 0;
} }