Skip to content

L
linux-davinci-2.6.23
Commit 7fe845d1 authored by gregkh@suse.de's avatar gregkh@suse.de Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] tty: move to use the new class code, instead of class_simple 

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e9ba6365
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
drivers/char/tty_io.c
View file @ 7fe845d1
...@@ -2654,7 +2654,7 @@ static void tty_default_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -2654,7 +2654,7 @@ static void tty_default_put_char(struct tty_struct *tty, unsigned char ch)
tty->driver->write(tty, &ch, 1); tty->driver->write(tty, &ch, 1);
} }
static struct class_simple *tty_class; static struct class *tty_class;
/** /**
* tty_register_device - register a tty device * tty_register_device - register a tty device
...@@ -2687,7 +2687,7 @@ void tty_register_device(struct tty_driver *driver, unsigned index, ...@@ -2687,7 +2687,7 @@ void tty_register_device(struct tty_driver *driver, unsigned index,
pty_line_name(driver, index, name); pty_line_name(driver, index, name);
else else
tty_line_name(driver, index, name); tty_line_name(driver, index, name);
class_simple_device_add(tty_class, dev, device, name); class_device_create(tty_class, dev, device, name);
} }
/** /**
...@@ -2701,7 +2701,7 @@ void tty_register_device(struct tty_driver *driver, unsigned index, ...@@ -2701,7 +2701,7 @@ void tty_register_device(struct tty_driver *driver, unsigned index,
void tty_unregister_device(struct tty_driver *driver, unsigned index) void tty_unregister_device(struct tty_driver *driver, unsigned index)
{ {
devfs_remove("%s%d", driver->devfs_name, index + driver->name_base); devfs_remove("%s%d", driver->devfs_name, index + driver->name_base);
class_simple_device_remove(MKDEV(driver->major, driver->minor_start) + index); class_device_destroy(tty_class, MKDEV(driver->major, driver->minor_start) + index);
} }
EXPORT_SYMBOL(tty_register_device); EXPORT_SYMBOL(tty_register_device);
...@@ -2918,7 +2918,7 @@ extern int vty_init(void); ...@@ -2918,7 +2918,7 @@ extern int vty_init(void);
static int __init tty_class_init(void) static int __init tty_class_init(void)
{ {
tty_class = class_simple_create(THIS_MODULE, "tty"); tty_class = class_create(THIS_MODULE, "tty");
if (IS_ERR(tty_class)) if (IS_ERR(tty_class))
return PTR_ERR(tty_class); return PTR_ERR(tty_class);
return 0; return 0;
...@@ -2947,14 +2947,14 @@ static int __init tty_init(void) ...@@ -2947,14 +2947,14 @@ static int __init tty_init(void)
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
panic("Couldn't register /dev/tty driver\n"); panic("Couldn't register /dev/tty driver\n");
devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty"); devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty");
class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty"); class_device_create(tty_class, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
cdev_init(&console_cdev, &console_fops); cdev_init(&console_cdev, &console_fops);
if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) || if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0) register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
panic("Couldn't register /dev/console driver\n"); panic("Couldn't register /dev/console driver\n");
devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console"); devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console");
class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 1), NULL, "console"); class_device_create(tty_class, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
#ifdef CONFIG_UNIX98_PTYS #ifdef CONFIG_UNIX98_PTYS
cdev_init(&ptmx_cdev, &ptmx_fops); cdev_init(&ptmx_cdev, &ptmx_fops);
...@@ -2962,7 +2962,7 @@ static int __init tty_init(void) ...@@ -2962,7 +2962,7 @@ static int __init tty_init(void)
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
panic("Couldn't register /dev/ptmx driver\n"); panic("Couldn't register /dev/ptmx driver\n");
devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx"); devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx");
class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx"); class_device_create(tty_class, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
#endif #endif
#ifdef CONFIG_VT #ifdef CONFIG_VT
...@@ -2971,7 +2971,7 @@ static int __init tty_init(void) ...@@ -2971,7 +2971,7 @@ static int __init tty_init(void)
register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
panic("Couldn't register /dev/tty0 driver\n"); panic("Couldn't register /dev/tty0 driver\n");
devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0"); devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0");
class_simple_device_add(tty_class, MKDEV(TTY_MAJOR, 0), NULL, "tty0"); class_device_create(tty_class, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
vty_init(); vty_init();
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment