lkml.org 
[lkml]   [2005]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [RFC] Changes to the driver model class code.
    patch 2 of 4

    Subject: tty: move to use the new class code, instead of class_simple

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    diff -Nru a/drivers/char/tty_io.c b/drivers/char/tty_io.c
    --- a/drivers/char/tty_io.c 2005-03-15 08:54:22 -08:00
    +++ b/drivers/char/tty_io.c 2005-03-15 08:54:22 -08:00
    @@ -2653,7 +2653,7 @@
    tty->driver->write(tty, &ch, 1);
    }

    -static struct class_simple *tty_class;
    +static struct class *tty_class;

    /**
    * tty_register_device - register a tty device
    @@ -2686,7 +2686,7 @@
    pty_line_name(driver, index, name);
    else
    tty_line_name(driver, index, name);
    - class_simple_device_add(tty_class, dev, device, name);
    + class_device_create(tty_class, dev, device, name);
    }

    /**
    @@ -2700,7 +2700,7 @@
    void tty_unregister_device(struct tty_driver *driver, unsigned index)
    {
    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);
    @@ -2917,7 +2917,7 @@

    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))
    return PTR_ERR(tty_class);
    return 0;
    @@ -2946,14 +2946,14 @@
    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
    panic("Couldn't register /dev/tty driver\n");
    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);
    if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
    panic("Couldn't register /dev/console driver\n");
    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
    cdev_init(&ptmx_cdev, &ptmx_fops);
    @@ -2961,7 +2961,7 @@
    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
    panic("Couldn't register /dev/ptmx driver\n");
    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

    #ifdef CONFIG_VT
    @@ -2970,7 +2970,7 @@
    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
    panic("Couldn't register /dev/tty0 driver\n");
    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();
    #endif
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:11    [W:0.023 / U:0.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site