* [PATCH 2.6.5] Add class support to drivers/char/ip2main.c
@ 2004-04-14 0:20 Hanna Linder
2004-04-14 0:34 ` Randy.Dunlap
0 siblings, 1 reply; 4+ messages in thread
From: Hanna Linder @ 2004-04-14 0:20 UTC (permalink / raw)
To: linux-kernel; +Cc: hannal, greg, mhw
Here is a patch to add class support to ip2main.c which is the Linux tty Device Driver for
IntelliPort family of multiport serial I/O controllers. This will enable udev to see these devices.
I have compiled but do not have the hardware to test. Please consider for testing or inclusion.
Thanks.
Hanna Linder
IBM Linux Technology Center
------
diff -Nrup -Xdontdiff linux-2.6.5/drivers/char/ip2main.c linux-2.6.5p/drivers/char/ip2main.c
--- linux-2.6.5/drivers/char/ip2main.c 2004-04-03 19:38:27.000000000 -0800
+++ linux-2.6.5p/drivers/char/ip2main.c 2004-04-13 17:07:41.000000000 -0700
@@ -99,6 +99,7 @@
#include <linux/slab.h>
#include <linux/major.h>
#include <linux/wait.h>
+#include <linux/device.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
@@ -301,6 +302,9 @@ static int iindx;
static char rirqs[IP2_MAX_BOARDS];
static int Valid_Irqs[] = { 3, 4, 5, 7, 10, 11, 12, 15, 0};
+/* for sysfs class support */
+static struct class_simple *ip2_class;
+
// Some functions to keep track of what irq's we have
static int __init
@@ -411,7 +415,9 @@ cleanup_module(void)
iiResetDelay( i2BoardPtrTable[i] );
/* free io addresses and Tibet */
release_region( ip2config.addr[i], 8 );
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i));
devfs_remove("ip2/ipl%d", i);
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
devfs_remove("ip2/stat%d", i);
}
/* Disable and remove interrupt handler. */
@@ -420,6 +426,7 @@ cleanup_module(void)
clear_requested_irq( ip2config.irq[i]);
}
}
+ class_simple_destroy(ip2_class);
devfs_remove("ip2");
if ( ( err = tty_unregister_driver ( ip2_tty_driver ) ) ) {
printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err);
@@ -494,7 +501,7 @@ int
ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
{
int i, j, box;
- int err;
+ int err = 0;
int status = 0;
static int loaded;
i2eBordStrPtr pB = NULL;
@@ -683,7 +690,14 @@ ip2_loadmain(int *iop, int *irqp, unsign
/* Register the IPL driver. */
if ( ( err = register_chrdev ( IP2_IPL_MAJOR, pcIpl, &ip2_ipl ) ) ) {
printk(KERN_ERR "IP2: failed to register IPL device (%d)\n", err );
- } else
+ } else {
+ /* create the sysfs class */
+ ip2_class = class_simple_create(THIS_MODULE, "ip2");
+ if (IS_ERR(ip2_class)) {
+ err = PTR_ERR(ip2_class);
+ goto out_chrdev;
+ }
+ }
/* Register the read_procmem thing */
if (!create_proc_info_entry("ip2mem",0,&proc_root,ip2_read_procmem)) {
printk(KERN_ERR "IP2: failed to register read_procmem\n");
@@ -700,13 +714,23 @@ ip2_loadmain(int *iop, int *irqp, unsign
}
if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {
- devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
+ class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i), NULL, "ipl%d", i);
+ err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
"ip2/ipl%d", i);
+ if (err) {
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i));
+ goto out_class;
+ }
- devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
+ class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1), NULL, "stat%d", i);
+ err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
"ip2/stat%d", i);
+ if (err) {
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
+ goto out_class;
+ }
for ( box = 0; box < ABS_MAX_BOXES; ++box )
{
@@ -759,8 +783,15 @@ retry:
}
}
ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );
+ goto out;
- return 0;
+out_class:
+ class_simple_destroy(ip2_class);
+
+out_chrdev:
+ unregister_chrdev(IP2_IPL_MAJOR, "ip2");
+out:
+ return err;
}
EXPORT_SYMBOL(ip2_loadmain);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.5] Add class support to drivers/char/ip2main.c
2004-04-14 0:20 [PATCH 2.6.5] Add class support to drivers/char/ip2main.c Hanna Linder
@ 2004-04-14 0:34 ` Randy.Dunlap
2004-04-14 17:28 ` Hanna Linder
0 siblings, 1 reply; 4+ messages in thread
From: Randy.Dunlap @ 2004-04-14 0:34 UTC (permalink / raw)
To: Hanna Linder; +Cc: linux-kernel, hannal, greg, mhw
On Tue, 13 Apr 2004 17:20:14 -0700 Hanna Linder wrote:
|
| Here is a patch to add class support to ip2main.c which is the Linux tty Device Driver for
| IntelliPort family of multiport serial I/O controllers. This will enable udev to see these devices.
|
| I have compiled but do not have the hardware to test. Please consider for testing or inclusion.
|
| ------
| diff -Nrup -Xdontdiff linux-2.6.5/drivers/char/ip2main.c linux-2.6.5p/drivers/char/ip2main.c
| --- linux-2.6.5/drivers/char/ip2main.c 2004-04-03 19:38:27.000000000 -0800
| +++ linux-2.6.5p/drivers/char/ip2main.c 2004-04-13 17:07:41.000000000 -0700
| @@ -683,7 +690,14 @@ ip2_loadmain(int *iop, int *irqp, unsign
| /* Register the IPL driver. */
| if ( ( err = register_chrdev ( IP2_IPL_MAJOR, pcIpl, &ip2_ipl ) ) ) {
| printk(KERN_ERR "IP2: failed to register IPL device (%d)\n", err );
| - } else
| + } else {
| + /* create the sysfs class */
| + ip2_class = class_simple_create(THIS_MODULE, "ip2");
| + if (IS_ERR(ip2_class)) {
| + err = PTR_ERR(ip2_class);
| + goto out_chrdev;
| + }
* indent that entire block.
| + }
| /* Register the read_procmem thing */
| if (!create_proc_info_entry("ip2mem",0,&proc_root,ip2_read_procmem)) {
| printk(KERN_ERR "IP2: failed to register read_procmem\n");
| @@ -700,13 +714,23 @@ ip2_loadmain(int *iop, int *irqp, unsign
| }
|
| if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {
| - devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
| + class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i), NULL, "ipl%d", i);
* line is too long. break it up.
| + err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
| S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
| "ip2/ipl%d", i);
| + if (err) {
| + class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i));
| + goto out_class;
| + }
|
| - devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
| + class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1), NULL, "stat%d", i);
* line is too long. break it up.
| + err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
| S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
| "ip2/stat%d", i);
| + if (err) {
| + class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
| + goto out_class;
| + }
|
| for ( box = 0; box < ABS_MAX_BOXES; ++box )
| {
| @@ -759,8 +783,15 @@ retry:
| }
| }
| ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );
| + goto out;
|
| - return 0;
| +out_class:
| + class_simple_destroy(ip2_class);
| +
| +out_chrdev:
| + unregister_chrdev(IP2_IPL_MAJOR, "ip2");
| +out:
| + return err;
| }
* use consistent spacing (lines) before labels. None needed here (before out_chrdev:).
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.5] Add class support to drivers/char/ip2main.c
2004-04-14 0:34 ` Randy.Dunlap
@ 2004-04-14 17:28 ` Hanna Linder
2004-05-02 6:32 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Hanna Linder @ 2004-04-14 17:28 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: Hanna Linder, linux-kernel, greg, mhw
--On Tuesday, April 13, 2004 05:34:06 PM -0700 "Randy.Dunlap" <rddunlap@osdl.org> wrote:
> * use consistent spacing (lines) before labels. None needed here (before out_chrdev:).
Thanks for the comments Randy, I have made all the changes you suggested. I have
also recompiled and tested this patch. Here it is.
Hanna Linder
IBM Linux Technology Center
------
diff -Nrup -Xdontdiff linux-2.6.5/drivers/char/ip2main.c linux-2.6.5p/drivers/char/ip2main.c
--- linux-2.6.5/drivers/char/ip2main.c 2004-04-03 19:38:27.000000000 -0800
+++ linux-2.6.5p/drivers/char/ip2main.c 2004-04-14 10:08:00.000000000 -0700
@@ -99,6 +99,7 @@
#include <linux/slab.h>
#include <linux/major.h>
#include <linux/wait.h>
+#include <linux/device.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
@@ -301,6 +302,9 @@ static int iindx;
static char rirqs[IP2_MAX_BOARDS];
static int Valid_Irqs[] = { 3, 4, 5, 7, 10, 11, 12, 15, 0};
+/* for sysfs class support */
+static struct class_simple *ip2_class;
+
// Some functions to keep track of what irq's we have
static int __init
@@ -411,7 +415,9 @@ cleanup_module(void)
iiResetDelay( i2BoardPtrTable[i] );
/* free io addresses and Tibet */
release_region( ip2config.addr[i], 8 );
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i));
devfs_remove("ip2/ipl%d", i);
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
devfs_remove("ip2/stat%d", i);
}
/* Disable and remove interrupt handler. */
@@ -420,6 +426,7 @@ cleanup_module(void)
clear_requested_irq( ip2config.irq[i]);
}
}
+ class_simple_destroy(ip2_class);
devfs_remove("ip2");
if ( ( err = tty_unregister_driver ( ip2_tty_driver ) ) ) {
printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err);
@@ -494,7 +501,7 @@ int
ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
{
int i, j, box;
- int err;
+ int err = 0;
int status = 0;
static int loaded;
i2eBordStrPtr pB = NULL;
@@ -683,7 +690,14 @@ ip2_loadmain(int *iop, int *irqp, unsign
/* Register the IPL driver. */
if ( ( err = register_chrdev ( IP2_IPL_MAJOR, pcIpl, &ip2_ipl ) ) ) {
printk(KERN_ERR "IP2: failed to register IPL device (%d)\n", err );
- } else
+ } else {
+ /* create the sysfs class */
+ ip2_class = class_simple_create(THIS_MODULE, "ip2");
+ if (IS_ERR(ip2_class)) {
+ err = PTR_ERR(ip2_class);
+ goto out_chrdev;
+ }
+ }
/* Register the read_procmem thing */
if (!create_proc_info_entry("ip2mem",0,&proc_root,ip2_read_procmem)) {
printk(KERN_ERR "IP2: failed to register read_procmem\n");
@@ -700,13 +714,27 @@ ip2_loadmain(int *iop, int *irqp, unsign
}
if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {
- devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
+ class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR,
+ 4 * i), NULL, "ipl%d", i);
+ err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
"ip2/ipl%d", i);
+ if (err) {
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR,
+ 4 * i));
+ goto out_class;
+ }
- devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
+ class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR,
+ 4 * i + 1), NULL, "stat%d", i);
+ err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
"ip2/stat%d", i);
+ if (err) {
+ class_simple_device_remove(MKDEV(IP2_IPL_MAJOR,
+ 4 * i + 1));
+ goto out_class;
+ }
for ( box = 0; box < ABS_MAX_BOXES; ++box )
{
@@ -759,8 +787,14 @@ retry:
}
}
ip2trace (ITRC_NO_PORT, ITRC_INIT, ITRC_RETURN, 0 );
+ goto out;
- return 0;
+out_class:
+ class_simple_destroy(ip2_class);
+out_chrdev:
+ unregister_chrdev(IP2_IPL_MAJOR, "ip2");
+out:
+ return err;
}
EXPORT_SYMBOL(ip2_loadmain);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.5] Add class support to drivers/char/ip2main.c
2004-04-14 17:28 ` Hanna Linder
@ 2004-05-02 6:32 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2004-05-02 6:32 UTC (permalink / raw)
To: Hanna Linder; +Cc: Randy.Dunlap, linux-kernel, mhw
On Wed, Apr 14, 2004 at 10:28:02AM -0700, Hanna Linder wrote:
> --On Tuesday, April 13, 2004 05:34:06 PM -0700 "Randy.Dunlap" <rddunlap@osdl.org> wrote:
>
> > * use consistent spacing (lines) before labels. None needed here (before out_chrdev:).
>
> Thanks for the comments Randy, I have made all the changes you suggested. I have
> also recompiled and tested this patch. Here it is.
Applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-05-02 6:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-04-14 0:20 [PATCH 2.6.5] Add class support to drivers/char/ip2main.c Hanna Linder
2004-04-14 0:34 ` Randy.Dunlap
2004-04-14 17:28 ` Hanna Linder
2004-05-02 6:32 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®