linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2.6 istallion.c] RFT added class support to istallion.c
@ 2004-03-24  1:50 Hanna Linder
  2004-03-25 18:43 ` Greg KH
  2004-04-08 23:35 ` Hanna Linder
  0 siblings, 2 replies; 4+ messages in thread
From: Hanna Linder @ 2004-03-24  1:50 UTC (permalink / raw)
  To: linux-kernel; +Cc: gerg, greg, hannal



Here is a patch to add class support to the Stallion Intelligent multiport 
serial driver.

I have verified it compiles but do not have the hardware. 
If you do please verify, thanks.

Please consider for Inclusion or Testing.

Thanks.

Hanna
---------
diff -Nrup -Xdontdiff linux-2.6.4/drivers/char/istallion.c linux-2.6.4p/drivers/char/istallion.c
--- linux-2.6.4/drivers/char/istallion.c	2004-03-10 18:55:34.000000000 -0800
+++ linux-2.6.4p/drivers/char/istallion.c	2004-03-23 16:49:29.000000000 -0800
@@ -40,6 +40,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -795,6 +796,8 @@ static int	stli_timeron;
 
 /*****************************************************************************/
 
+static struct class_simple *istallion_class;
+
 #ifdef MODULE
 
 /*
@@ -853,9 +856,12 @@ static void __exit istallion_module_exit
 		return;
 	}
 	put_tty_driver(stli_serial);
-	for (i = 0; i < 4; i++)
+	for (i = 0; i < 4; i++) {
 		devfs_remove("staliomem/%d", i);
+		class_simple_device_remove(MKDEV(STL_SIOMEMMAJOR, i));
+	}
 	devfs_remove("staliomem");
+	class_simple_destroy(istallion_class);
 	if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
 		printk("STALLION: failed to un-register serial memory device, "
 			"errno=%d\n", -i);
@@ -5311,10 +5317,13 @@ int __init stli_init(void)
 				"device\n");
 
 	devfs_mk_dir("staliomem");
+	istallion_class = class_simple_create(THIS_MODULE, "staliomem");
 	for (i = 0; i < 4; i++) {
 		devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
 			       S_IFCHR | S_IRUSR | S_IWUSR,
 			       "staliomem/%d", i);
+		class_simple_device_add(istallion_class, MKDEV(STL_SIOMEMMAJOR, i), 
+				NULL, "staliomem/%d", i);
 	}
 
 /*


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2.6 istallion.c] RFT added class support to istallion.c
  2004-03-24  1:50 [PATCH 2.6 istallion.c] RFT added class support to istallion.c Hanna Linder
@ 2004-03-25 18:43 ` Greg KH
  2004-04-08 23:35 ` Hanna Linder
  1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2004-03-25 18:43 UTC (permalink / raw)
  To: Hanna Linder; +Cc: linux-kernel, gerg

On Tue, Mar 23, 2004 at 05:50:56PM -0800, Hanna Linder wrote:
> 
> 
> Here is a patch to add class support to the Stallion Intelligent multiport 
> serial driver.
> 
> I have verified it compiles but do not have the hardware. 
> If you do please verify, thanks.
> 
> Please consider for Inclusion or Testing.

Applied to my trees, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2.6 istallion.c] RFT added class support to istallion.c
  2004-03-24  1:50 [PATCH 2.6 istallion.c] RFT added class support to istallion.c Hanna Linder
  2004-03-25 18:43 ` Greg KH
@ 2004-04-08 23:35 ` Hanna Linder
  2004-04-09 18:53   ` Greg KH
  1 sibling, 1 reply; 4+ messages in thread
From: Hanna Linder @ 2004-04-08 23:35 UTC (permalink / raw)
  To: linux-kernel; +Cc: Hanna Linder, gerg, greg


Realized I put a / in the filename of this device too.

Here is the fix:

diff -Nrup -Xdontdiff linux-2.6.5/drivers/char/istallion.c linux-2.6.5p/drivers/char/istallion.c
--- linux-2.6.5/drivers/char/istallion.c	2004-04-08 16:26:14.000000000 -0700
+++ linux-2.6.5p/drivers/char/istallion.c	2004-04-08 16:26:44.000000000 -0700
@@ -5323,7 +5323,7 @@ int __init stli_init(void)
 			       S_IFCHR | S_IRUSR | S_IWUSR,
 			       "staliomem/%d", i);
 		class_simple_device_add(istallion_class, MKDEV(STL_SIOMEMMAJOR, i), 
-				NULL, "staliomem/%d", i);
+				NULL, "staliomem%d", i);
 	}
 
 /*


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2.6 istallion.c] RFT added class support to istallion.c
  2004-04-08 23:35 ` Hanna Linder
@ 2004-04-09 18:53   ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2004-04-09 18:53 UTC (permalink / raw)
  To: Hanna Linder; +Cc: linux-kernel, gerg

On Thu, Apr 08, 2004 at 04:35:26PM -0700, Hanna Linder wrote:
> 
> Realized I put a / in the filename of this device too.
> 
> Here is the fix:

Applied, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2004-04-09 19:07 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-03-24  1:50 [PATCH 2.6 istallion.c] RFT added class support to istallion.c Hanna Linder
2004-03-25 18:43 ` Greg KH
2004-04-08 23:35 ` Hanna Linder
2004-04-09 18:53   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).