Please consider the following patch for inclusion. From: Hansjoerg Lipp <[email protected]> Let tty_register_device() return a pointer to the class device it creates. This allows registrants to add their own sysfs files under the class device node. Signed-off-by: Hansjoerg Lipp <[email protected]> Signed-off-by: Tilman Schmidt <[email protected]> --- drivers/char/tty_io.c | 11 +++++++---- include/linux/tty.h | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff -urpN -X exclude linux-2.6.17-rc1-mm2.orig/drivers/char/tty_io.c linux-2.6.17-rc1-mm2/drivers/char/tty_io.c --- linux-2.6.17-rc1-mm2.orig/drivers/char/tty_io.c 2006-04-09 18:30:56.000000000 +0200 +++ linux-2.6.17-rc1-mm2/drivers/char/tty_io.c 2006-04-18 23:17:32.000000000 +0200 @@ -2957,12 +2957,14 @@ static struct class *tty_class; * This field is optional, if there is no known struct device for this * tty device it can be set to NULL safely. * + * Returns a pointer to the class device (or NULL on error). + * * This call is required to be made to register an individual tty device if * the tty driver's flags have the TTY_DRIVER_NO_DEVFS bit set. If that * bit is not set, this function should not be called. */ -void tty_register_device(struct tty_driver *driver, unsigned index, - struct device *device) +struct class_device *tty_register_device(struct tty_driver *driver, + unsigned index, struct device *device) { char name[64]; dev_t dev = MKDEV(driver->major, driver->minor_start) + index; @@ -2970,7 +2972,7 @@ void tty_register_device(struct tty_driv if (index >= driver->num) { printk(KERN_ERR "Attempt to register invalid tty line number " " (%d).\n", index); - return; + return NULL; } devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR, @@ -2980,7 +2982,8 @@ void tty_register_device(struct tty_driv pty_line_name(driver, index, name); else tty_line_name(driver, index, name); - class_device_create(tty_class, NULL, dev, device, "%s", name); + + return class_device_create(tty_class, NULL, dev, device, "%s", name); } /** diff -urpN -X exclude linux-2.6.17-rc1-mm2.orig/include/linux/tty.h linux-2.6.17-rc1-mm2/include/linux/tty.h --- linux-2.6.17-rc1-mm2.orig/include/linux/tty.h 2006-04-04 23:29:14.000000000 +0200 +++ linux-2.6.17-rc1-mm2/include/linux/tty.h 2006-04-18 23:22:47.000000000 +0200 @@ -291,7 +291,9 @@ extern int tty_register_ldisc(int disc, extern int tty_unregister_ldisc(int disc); extern int tty_register_driver(struct tty_driver *driver); extern int tty_unregister_driver(struct tty_driver *driver); -extern void tty_register_device(struct tty_driver *driver, unsigned index, struct device *dev); +extern struct class_device *tty_register_device(struct tty_driver *driver, + unsigned index, + struct device *dev); extern void tty_unregister_device(struct tty_driver *driver, unsigned index); extern int tty_read_raw_data(struct tty_struct *tty, unsigned char *bufp, int buflen); -- Tilman Schmidt E-Mail: [email protected] Bonn, Germany Imagine a world without hypothetical situations.
Attachment:
signature.asc
Description: OpenPGP digital signature
- Follow-Ups:
- Prev by Date: Re: [PATCH 1/2] ext3 percpu counter fixes to suppport for more than 2**31 ext3 free blocks counter
- Next by Date: Re: Linux 2.6.17-rc2 - notifier chain problem?
- Previous by thread: What's in git.git
- Next by thread: Re: [PATCH 2.6.17-rc2 1/2] return class device pointer from tty_register_device()
- Index(es):
 |