[PATCH] jsm driver - Linux-2.6.12.3

[PATCH] jsm driver - Linux-2.6.12.3

[V. ANANDA KRISHNAN]

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

Hi All,

 Here is a patch to the jsm driver in the Linux (drivers/serial/jsm).
This patch takes care of (1) compiler warnings which displays the mixing
of declarations and code (2) dynamic allocation of major device number
instead of the static number 253 (3) the version update to reflect the
changes in the patch.

 Please CC me your comments.  Thanks.
Signed-off-by: V. Ananda Krishnan <mansarov-at-us-dot-ibm-dot-com>






[-- Attachment #2: patch_jsm_korg-2.6.12.3 --]
[-- Type: text/x-patch, Size: 4356 bytes --]

diff -Nuar linux-2.6.12.3.orig/drivers/serial/jsm/jsm_driver.c linux-2.6.12.3.new/drivers/serial/jsm/jsm_driver.c
--- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_driver.c	2005-07-19 15:16:20.000000000 -0500
+++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_driver.c	2005-07-19 15:18:57.000000000 -0500
@@ -22,6 +22,10 @@
  * Scott H Kilau <Scott_Kilau@digi.com>
  * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
  *
+ * CHANGE LOG:
+ * Jul 18, 2005: Changed the major number changed to 0 to use the dynamic
+ *	allocation of major number by OS.
+ *
  ***********************************************************************/
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
@@ -42,7 +46,7 @@
 	.owner		= THIS_MODULE,
 	.driver_name	= JSM_DRIVER_NAME,
 	.dev_name	= "ttyn",
-	.major		= 253,
+	.major		= 0,
 	.minor		= JSM_MINOR_START,
 	.nr		= NR_PORTS,
 };
diff -Nuar linux-2.6.12.3.orig/drivers/serial/jsm/jsm.h linux-2.6.12.3.new/drivers/serial/jsm/jsm.h
--- linux-2.6.12.3.orig/drivers/serial/jsm/jsm.h	2005-07-19 15:16:21.000000000 -0500
+++ linux-2.6.12.3.new/drivers/serial/jsm/jsm.h	2005-07-19 15:18:58.000000000 -0500
@@ -22,6 +22,9 @@
  * Scott H Kilau <Scott_Kilau@digi.com>
  * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
  *
+ * CHANGE LOG:
+ * Jul 18, 2005: Changed the JSM_VERSION to "jsm: 1.2-1-INKERNEL"
+ *
  ***********************************************************************/
 
 #ifndef __JSM_DRIVER_H
@@ -90,7 +93,7 @@
 #define WRITEBUFLEN	((4096) + 4)
 #define MYFLIPLEN	N_TTY_BUF_SIZE
 
-#define JSM_VERSION	"jsm: 1.1-1-INKERNEL"
+#define JSM_VERSION	"jsm: 1.2-1-INKERNEL"
 #define JSM_PARTNUM	"40002438_A-INKERNEL"
 
 struct jsm_board;
diff -Nuar linux-2.6.12.3.orig/drivers/serial/jsm/jsm_neo.c linux-2.6.12.3.new/drivers/serial/jsm/jsm_neo.c
--- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_neo.c	2005-07-19 15:16:22.000000000 -0500
+++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_neo.c	2005-07-19 15:19:00.000000000 -0500
@@ -22,6 +22,9 @@
  * Scott H Kilau <Scott_Kilau@digi.com>
  * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
  *
+ * CHANGE LOG:
+ * Jul 18, 2005: separated the mixed declarations and code.
+ *
  ***********************************************************************/
 #include <linux/delay.h>	/* For udelay */
 #include <linux/serial_reg.h>	/* For the various UART offsets */
@@ -48,8 +51,9 @@
 
 static void neo_set_cts_flow_control(struct jsm_channel *ch)
 {
-	u8 ier = readb(&ch->ch_neo_uart->ier);
-	u8 efr = readb(&ch->ch_neo_uart->efr);
+	u8 ier, efr;
+	ier = readb(&ch->ch_neo_uart->ier);
+	efr = readb(&ch->ch_neo_uart->efr);
 
 	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n");
 
@@ -78,8 +82,9 @@
 
 static void neo_set_rts_flow_control(struct jsm_channel *ch)
 {
-	u8 ier = readb(&ch->ch_neo_uart->ier);
-	u8 efr = readb(&ch->ch_neo_uart->efr);
+	u8 ier, efr;
+	ier = readb(&ch->ch_neo_uart->ier);
+	efr = readb(&ch->ch_neo_uart->efr);
 
 	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n");
 
@@ -117,8 +122,9 @@
 
 static void neo_set_ixon_flow_control(struct jsm_channel *ch)
 {
-	u8 ier = readb(&ch->ch_neo_uart->ier);
-	u8 efr = readb(&ch->ch_neo_uart->efr);
+	u8 ier, efr;
+	ier = readb(&ch->ch_neo_uart->ier);
+	efr = readb(&ch->ch_neo_uart->efr);
 
 	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n");
 
@@ -153,8 +159,9 @@
 
 static void neo_set_ixoff_flow_control(struct jsm_channel *ch)
 {
-	u8 ier = readb(&ch->ch_neo_uart->ier);
-	u8 efr = readb(&ch->ch_neo_uart->efr);
+	u8 ier, efr;
+	ier = readb(&ch->ch_neo_uart->ier);
+	efr = readb(&ch->ch_neo_uart->efr);
 
 	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n");
 
@@ -190,8 +197,9 @@
 
 static void neo_set_no_input_flow_control(struct jsm_channel *ch)
 {
-	u8 ier = readb(&ch->ch_neo_uart->ier);
-	u8 efr = readb(&ch->ch_neo_uart->efr);
+	u8 ier, efr;
+	ier = readb(&ch->ch_neo_uart->ier);
+	efr = readb(&ch->ch_neo_uart->efr);
 
 	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n");
 
@@ -228,8 +236,9 @@
 
 static void neo_set_no_output_flow_control(struct jsm_channel *ch)
 {
-	u8 ier = readb(&ch->ch_neo_uart->ier);
-	u8 efr = readb(&ch->ch_neo_uart->efr);
+	u8 ier, efr;
+	ier = readb(&ch->ch_neo_uart->ier);
+	efr = readb(&ch->ch_neo_uart->efr);
 
 	jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");
 

Re: [PATCH] jsm driver - Linux-2.6.12.3

[Alexey Dobriyan]

On Tue, Jul 19, 2005 at 12:53:20PM -0500, V. ANANDA KRISHNAN wrote:
> This patch takes care of (1) compiler warnings which displays the mixing
> of declarations and code

With what gcc version and what CFLAGS?

> (2) dynamic allocation of major device number
> instead of the static number 253 (3) the version update to reflect the
> changes in the patch.

> --- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_driver.c
> +++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_driver.c

> + * CHANGE LOG:
> + * Jul 18, 2005: Changed the major number changed to 0 to use the dynamic
> + *	allocation of major number by OS.
> + *

ChangeLog maintenance is the job of SCM. Don't add useless comments.

> --- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_neo.c
> +++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_neo.c

> -	u8 ier = readb(&ch->ch_neo_uart->ier);
> -	u8 efr = readb(&ch->ch_neo_uart->efr);
> +	u8 ier, efr;
> +	ier = readb(&ch->ch_neo_uart->ier);
> +	efr = readb(&ch->ch_neo_uart->efr);

Re: [PATCH] jsm driver - Linux-2.6.12.3

[V. ANANDA KRISHNAN]

I am using RHEL4.0-U1 as the distro. Here is the info on gcc version is
3.4.3-22.1

Thanks for your feed-back.

Ananda Krishnan
On Tue, 2005-07-19 at 22:47 +0400, Alexey Dobriyan wrote:
> On Tue, Jul 19, 2005 at 12:53:20PM -0500, V. ANANDA KRISHNAN wrote:
> > This patch takes care of (1) compiler warnings which displays the mixing
> > of declarations and code
> 
> With what gcc version and what CFLAGS?
> 
> > (2) dynamic allocation of major device number
> > instead of the static number 253 (3) the version update to reflect the
> > changes in the patch.
> 
> > --- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_driver.c
> > +++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_driver.c
> 
> > + * CHANGE LOG:
> > + * Jul 18, 2005: Changed the major number changed to 0 to use the dynamic
> > + *	allocation of major number by OS.
> > + *
> 
> ChangeLog maintenance is the job of SCM. Don't add useless comments.
> 
> > --- linux-2.6.12.3.orig/drivers/serial/jsm/jsm_neo.c
> > +++ linux-2.6.12.3.new/drivers/serial/jsm/jsm_neo.c
> 
> > -	u8 ier = readb(&ch->ch_neo_uart->ier);
> > -	u8 efr = readb(&ch->ch_neo_uart->efr);
> > +	u8 ier, efr;
> > +	ier = readb(&ch->ch_neo_uart->ier);
> > +	efr = readb(&ch->ch_neo_uart->efr);
> 
> 

Re: [PATCH] jsm driver - Linux-2.6.12.3

[V. ANANDA KRISHNAN]

[-- Attachment #1: Type: text/plain, Size: 721 bytes --]

Hi All,

  I would like to rescind the patch that was posted here on Jul 19, 2005
with the subject [PATCH] jsm driver - Linux-2.6.12.3, since I am
submitting the patch against development kernel-2.6.13-rc3. The patch
takes care of the major device number change. A full description of the
change is given below.

  In the kernel-2.6.12.3 version, the jsm driver uses a static number of
253.  The major number 253 is a reserved for "LOCAL/EXPERIMENTAL USE" by
both char and block devices.  So the current patch takes advantage of
the dynamic allocation of major number by the kernel.
 
  Please CC me your comments.  Thanks.
  Signed-off-by: V. Ananda Krishnan <mansarov@us.ibm.com>
                                    



[-- Attachment #2: patch_jsm_korg-072505 --]
[-- Type: text/x-patch, Size: 470 bytes --]

diff -Naur linux-2.6.12.3/drivers/serial/jsm/jsm_driver.c linux-2.6.12.3-new/drivers/serial/jsm/jsm_driver.c
--- linux-2.6.12.3/drivers/serial/jsm/jsm_driver.c	2005-07-25 17:13:59.000000000 -0500
+++ linux-2.6.12.3-new/drivers/serial/jsm/jsm_driver.c	2005-07-25 17:14:39.000000000 -0500
@@ -42,7 +42,7 @@
 	.owner		= THIS_MODULE,
 	.driver_name	= JSM_DRIVER_NAME,
 	.dev_name	= "ttyn",
-	.major		= 253,
+	.major		= 0,
 	.minor		= JSM_MINOR_START,
 	.nr		= NR_PORTS,
 };