Skip to contentSkip to conversation

patch Staging-comedi-fix-coding-style-issues.patch

PATCH Stewart Robertson 3 participants 3 messages Feb 27, 2010 – Mar 1, 2010 Staging

lore
Share & tools
lore
#0 lore raw

I've fixed most of the issues found by checkpatch.pl in 'linux-2.6/drivers/staging/comedi/drivers/ni_daq_dio24.c' and attached the patch. I forgot to put the driver name in the main description and didn't know if I could
change the name of the patch without messing it up.

I've tried setting Thunderbird to not mangle text but in case it does, I have attached the patch as well.

I did some research and had a go at fixing the warning
'WARNING: printk() should include KERN_ facility level'
by adding KERN_INFO in front of the quoted text. Please let me know if that is the right thing to do and if not, what I should do instead.

Cheers,

Stewart

Quoted 1 line

From ce043603489db7592ff7527ae97630d7c6100296 Mon Sep 17 00:00:00 2001

From: Stewart Robertson <str@minty7.(none)>
Date: Sat, 27 Feb 2010 10:03:27 +0000
Subject: [PATCH] Staging: comedi: fix coding style issues This is a patch to the ni_daq_dio24.c file that fixes line over 80 characters and KERN_INFO issues found by checkpatch.pl

---
drivers/staging/comedi/drivers/ni_daq_dio24.c | 67 +++++++++++++-----------

1 files changed, 36 insertions(+), 31 deletions(-)
drivers/staging/comedi/drivers/ni_daq_dio24.c +2 -2
index 9017be3..681df0b 100644
@@ -3,8 +3,8 @@
    Driver for National Instruments PCMCIA DAQ-Card DIO-24
    Copyright (C) 2002 Daniel Vecino Castel <[email protected]>
 
-    PCMCIA crap at end of file is adapted from dummy_cs.c 1.31 2001/08/24 12:13:13
-    from the pcmcia package.
+    PCMCIA crap at end of file is adapted from
+    dummy_cs.c 1.31 2001/08/24 12:13:13 from the pcmcia package.
    The initial developer of the pcmcia dummy_cs.c code is David A. Hinds
    <[email protected]>.  Portions created by David A. Hinds
    are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
@@ -37,7 +37,8 @@ This is just a wrapper around the 8255.o driver to properly handle

the PCMCIA interface.
*/

- /* #define LABPC_DEBUG *//* enable debugging messages */
+/* #define LABPC_DEBUG */
+/* enable debugging messages */
#undef LABPC_DEBUG

#include <linux/interrupt.h>
@@ -55,7 +56,7 @@ the PCMCIA interface.

static struct pcmcia_device *pcmcia_cur_dev = NULL;

-#define DIO24_SIZE 4 /* size of io region used by board */
+#define DIO24_SIZE 4 /* size of io region used by board */

static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it); static int dio24_detach(struct comedi_device *dev);
@@ -64,10 +65,13 @@ enum dio24_bustype { pcmcia_bustype };

struct dio24_board_struct {
	const char *name;

- int device_id; /* device id for pcmcia board */
- enum dio24_bustype bustype; /* PCMCIA */
- int have_dio; /* have 8255 chip */
- /* function pointers so we can use inb/outb or readb/writeb as appropriate */
+ int device_id; /* device id for pcmcia board */
+ enum dio24_bustype bustype; /* PCMCIA */
+ int have_dio; /* have 8255 chip */
+ /*
+ * function pointers so we can use inb/outb or
+ * readb/writeb as appropriate
+ */

	unsigned int (*read_byte) (unsigned int address);
	void (*write_byte) (unsigned int byte, unsigned int address);
};
@@ -75,16 +79,18 @@ struct dio24_board_struct {
static const struct dio24_board_struct dio24_boards[] = {
	{
	 .name = "daqcard-dio24",

- .device_id = 0x475c, /* 0x10b is manufacturer id, 0x475c is device id */
- .bustype = pcmcia_bustype,
- .have_dio = 1,
- },
+ /* 0x10b is manufacturer id, 0x475c is device id */
+ .device_id = 0x475c,
+ .bustype = pcmcia_bustype,
+ .have_dio = 1,
+ },

	{

- .name = "ni_daq_dio24",
- .device_id = 0x475c, /* 0x10b is manufacturer id, 0x475c is device id */
- .bustype = pcmcia_bustype,
- .have_dio = 1,
- },
+ .name = "ni_daq_dio24",
+ /* 0x10b is manufacturer id, 0x475c is device id */
+ .device_id = 0x475c,
+ .bustype = pcmcia_bustype,
+ .have_dio = 1,
+ },
};

/*
@@ -134,22 +140,21 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)

#endif
		break;
	default:
-		printk("bug! couldn't determine board type\n");
+		printk(KERN_INFO "bug! couldn't determine board type\n");
		return -EINVAL;
		break;
	}
-	printk("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
+	printk(KERN_INFO "comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
	       thisboard->name, iobase);
#ifdef incomplete
-	if (irq) {
+	if (irq)
		printk(", irq %u", irq);

- }
#endif

	printk("\n");

	if (iobase == 0) {
-		printk("io base address is zero!\n");
+		printk(KERN_INFO "io base address is zero!\n");
		return -EINVAL;
	}

@@ -174,7 +179,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)

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

	if (dev->subdevices)
		subdev_8255_cleanup(dev, dev->subdevices + 0);
@@ -390,9 +395,9 @@ static void dio24_config(struct pcmcia_device *link)
	}

	/*
-	   Allocate an interrupt line.  Note that this does not assign a
-	   handler to the interrupt, unless the 'Handler' member of the
-	   irq structure is initialized.
+	 * Allocate an interrupt line.  Note that this does not assign a
+	 * handler to the interrupt, unless the 'Handler' member of the
+	 * irq structure is initialized.
	 */
	if (link->conf.Attributes & CONF_ENABLE_IRQ) {
		ret = pcmcia_request_irq(link, &link->irq);
@@ -401,17 +406,17 @@ static void dio24_config(struct pcmcia_device *link)
	}

	/*
-	   This actually configures the PCMCIA socket -- setting up
-	   the I/O windows and the interrupt mapping, and putting the
-	   card and host interface into "Memory and IO" mode.
+	 * This actually configures the PCMCIA socket -- setting up
+	 * the I/O windows and the interrupt mapping, and putting the
+	 * card and host interface into "Memory and IO" mode.
	 */
	ret = pcmcia_request_configuration(link, &link->conf);
	if (ret)
		goto failed;

	/*

- At this point, the dev_node_t structure(s) need to be
- initialized and arranged in a linked list at link->dev.
+ * At this point, the dev_node_t structure(s) need to be
+ * initialized and arranged in a linked list at link->dev.

	 */
	sprintf(dev->node.dev_name, "ni_daq_dio24");
	dev->node.major = dev->node.minor = 0;
Signature · 1 line
1.6.0.4
Quoted 1 line

From ce043603489db7592ff7527ae97630d7c6100296 Mon Sep 17 00:00:00 2001

From: Stewart Robertson <str@minty7.(none)>
Date: Sat, 27 Feb 2010 10:03:27 +0000
Subject: [PATCH] Staging: comedi: fix coding style issues
This is a patch to the ni_daq_dio24.c file that fixes line over 80 characters and KERN_INFO issues found by checkpatch.pl

---
 drivers/staging/comedi/drivers/ni_daq_dio24.c |   67 +++++++++++++-----------
 1 files changed, 36 insertions(+), 31 deletions(-)
drivers/staging/comedi/drivers/ni_daq_dio24.c +36 -31

139 lines not on this page · raw message

Signature · 1 line
1.6.0.4
#1 lore raw

Hi Stewart,

Quoted 5 lines · Stewart Robertson

I did some research and had a go at fixing the warning 'WARNING: printk() should include KERN_ facility level'
by adding KERN_INFO in front of the quoted text. Please let me know if that is the right thing to do and if not,
what I should do instead.

Yes this is right thing to do "printk(KERN_INFO "");" You can also do pr_info("");

Cheers,
Ameya.

#2 lore raw
In reply to Stewart Robertson

Hey,

Quoted 1 line · Stewart Robertson

From: Stewart Robertson <str@minty7.(none)>

Could you use a proper email-address here, please?

Quoted 5 lines

Date: Sat, 27 Feb 2010 10:03:27 +0000
Subject: [PATCH] Staging: comedi: fix coding style issues This is a patch to the ni_daq_dio24.c file that fixes line over 80 characters and KERN_INFO issues found by checkpatch.pl

Please add a few spare blank lines between the Subject and the message, and between the latter and the SoB-line.

Thanks!

Dominik