2009-11-20 23:46:09

by Bruce Beare

Subject: [PATCH 0/3] checkpatch.pl cleanups for drivers/staging/comedi/drivers/pcmad.c

Three patches are included to cleanup
drivers/staging/comedi/drivers/pcmad.c file to eliminate
all errors found by scripts/checkpatch.pl.

Bruce Beare (3):
Cleanup: code indent warning messages (use tabs instead of leading
spaces).
Cleanup: Remove unneeded braces (cleanup warning message)
cleanup: printk() warnings for including the facility level. cleanup:
add a printk("\n") to terminate the print for the non-error case.

drivers/staging/comedi/drivers/pcmad.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)

2009-11-20 23:46:13

by Bruce Beare

Subject: [PATCH 1/3] Cleanup: code indent warning messages (use tabs instead of leading spaces).

Signed-off-by: Bruce Beare <[email protected]>
---
drivers/staging/comedi/drivers/pcmad.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index acac670..202bfd4 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -34,11 +34,11 @@ Configuration options:
[0] - I/O port base
[1] - unused
[2] - Analog input reference
- 0 = single ended
- 1 = differential
+ 0 = single ended
+ 1 = differential
[3] - Analog input encoding (must match jumpers)
- 0 = straight binary
- 1 = two's complement
+ 0 = straight binary
+ 1 = two's complement
*/

#include <linux/interrupt.h>
--
1.6.2.5

2009-11-20 23:46:32

by Bruce Beare

Subject: [PATCH 2/3] Cleanup: Remove unneeded braces (cleanup warning message)

Signed-off-by: Bruce Beare <[email protected]>
---
drivers/staging/comedi/drivers/pcmad.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index 202bfd4..787aea2 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -113,9 +113,8 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
data[n] = inb(dev->iobase + PCMAD_LSB);
data[n] |= (inb(dev->iobase + PCMAD_MSB) << 8);

- if (devpriv->twos_comp) {
+ if (devpriv->twos_comp)
data[n] ^= (1 << (this_board->n_ai_bits - 1));
- }
}

return n;
@@ -168,9 +167,8 @@ static int pcmad_detach(struct comedi_device *dev)
{
printk("comedi%d: pcmad: remove\n", dev->minor);

- if (dev->irq) {
+ if (dev->irq)
free_irq(dev->irq, dev);
- }
if (dev->iobase)
release_region(dev->iobase, PCMAD_SIZE);

--
1.6.2.5

2009-11-20 23:46:20

by Bruce Beare

Subject: [PATCH 3/3] cleanup: printk() warnings for including the facility level. cleanup: add a printk("\n") to terminate the print for the non-error case.

Signed-off-by: Bruce Beare <[email protected]>
---
drivers/staging/comedi/drivers/pcmad.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index 787aea2..75b61a2 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -134,11 +134,12 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;

iobase = it->options[0];
- printk("comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
+ printk(KERN_NOTICE "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
- printk("I/O port conflict\n");
+ printk(KERN_CONT "I/O port conflict\n");
return -EIO;
}
+ printk(KERN_CONT "\n");
dev->iobase = iobase;

ret = alloc_subdevices(dev, 1);
@@ -165,7 +166,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)

static int pcmad_detach(struct comedi_device *dev)
{
- printk("comedi%d: pcmad: remove\n", dev->minor);
+ printk(KERN_NOTICE "comedi%d: pcmad: remove\n", dev->minor);

if (dev->irq)
free_irq(dev->irq, dev);
--
1.6.2.5