From: Andrew Morton The reappearance of this patch is a mystery. Perhaps it was to prevent me from getting bored on a quiet Sunday afternoon? Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/char/tty_io.c | 19 +++++++++---------- drivers/isdn/gigaset/common.c | 2 +- drivers/isdn/gigaset/gigaset.h | 2 +- drivers/isdn/gigaset/interface.c | 10 +++++----- drivers/isdn/gigaset/proc.c | 19 +++++++++---------- include/linux/tty.h | 5 +++-- 6 files changed, 28 insertions(+), 29 deletions(-) diff -puN drivers/char/tty_io.c~revert-gregkh-driver-tty-device drivers/char/tty_io.c --- a/drivers/char/tty_io.c~revert-gregkh-driver-tty-device +++ a/drivers/char/tty_io.c @@ -3612,8 +3612,7 @@ 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 struct device for this tty device - * (or ERR_PTR(-EFOO) on error). + * Returns a pointer to the class device (or ERR_PTR(-EFOO) 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_DYNAMIC_DEV bit set. If @@ -3623,8 +3622,8 @@ static struct class *tty_class; * Locking: ?? */ -struct device *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; @@ -3640,7 +3639,7 @@ struct device *tty_register_device(struc else tty_line_name(driver, index, name); - return device_create(tty_class, device, dev, name); + return class_device_create(tty_class, NULL, dev, device, "%s", name); } /** @@ -3656,7 +3655,7 @@ struct device *tty_register_device(struc void tty_unregister_device(struct tty_driver *driver, unsigned index) { - device_destroy(tty_class, MKDEV(driver->major, driver->minor_start) + index); + class_device_destroy(tty_class, MKDEV(driver->major, driver->minor_start) + index); } EXPORT_SYMBOL(tty_register_device); @@ -3896,20 +3895,20 @@ static int __init tty_init(void) if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) panic("Couldn't register /dev/tty driver\n"); - device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), "tty"); + class_device_create(tty_class, NULL, 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"); - device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), "console"); + class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console"); #ifdef CONFIG_UNIX98_PTYS cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) panic("Couldn't register /dev/ptmx driver\n"); - device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), "ptmx"); + class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx"); #endif #ifdef CONFIG_VT @@ -3917,7 +3916,7 @@ static int __init tty_init(void) if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) panic("Couldn't register /dev/tty0 driver\n"); - device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0"); + class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0"); vty_init(); #endif diff -puN drivers/isdn/gigaset/common.c~revert-gregkh-driver-tty-device drivers/isdn/gigaset/common.c --- a/drivers/isdn/gigaset/common.c~revert-gregkh-driver-tty-device +++ a/drivers/isdn/gigaset/common.c @@ -702,7 +702,7 @@ struct cardstate *gigaset_initcs(struct cs->open_count = 0; cs->dev = NULL; cs->tty = NULL; - cs->tty_dev = NULL; + cs->class = NULL; cs->cidmode = cidmode != 0; //if(onechannel) { //FIXME diff -puN drivers/isdn/gigaset/gigaset.h~revert-gregkh-driver-tty-device drivers/isdn/gigaset/gigaset.h --- a/drivers/isdn/gigaset/gigaset.h~revert-gregkh-driver-tty-device +++ a/drivers/isdn/gigaset/gigaset.h @@ -444,7 +444,7 @@ struct cardstate { struct gigaset_driver *driver; unsigned minor_index; struct device *dev; - struct device *tty_dev; + struct class_device *class; const struct gigaset_ops *ops; diff -puN drivers/isdn/gigaset/interface.c~revert-gregkh-driver-tty-device drivers/isdn/gigaset/interface.c --- a/drivers/isdn/gigaset/interface.c~revert-gregkh-driver-tty-device +++ a/drivers/isdn/gigaset/interface.c @@ -625,13 +625,13 @@ void gigaset_if_init(struct cardstate *c return; tasklet_init(&cs->if_wake_tasklet, &if_wake, (unsigned long) cs); - cs->tty_dev = tty_register_device(drv->tty, cs->minor_index, NULL); + cs->class = tty_register_device(drv->tty, cs->minor_index, NULL); - if (!IS_ERR(cs->tty_dev)) - dev_set_drvdata(cs->tty_dev, cs); + if (!IS_ERR(cs->class)) + class_set_devdata(cs->class, cs); else { warn("could not register device to the tty subsystem"); - cs->tty_dev = NULL; + cs->class = NULL; } } @@ -645,7 +645,7 @@ void gigaset_if_free(struct cardstate *c tasklet_disable(&cs->if_wake_tasklet); tasklet_kill(&cs->if_wake_tasklet); - cs->tty_dev = NULL; + cs->class = NULL; tty_unregister_device(drv->tty, cs->minor_index); } diff -puN drivers/isdn/gigaset/proc.c~revert-gregkh-driver-tty-device drivers/isdn/gigaset/proc.c --- a/drivers/isdn/gigaset/proc.c~revert-gregkh-driver-tty-device +++ a/drivers/isdn/gigaset/proc.c @@ -16,12 +16,11 @@ #include "gigaset.h" #include -static ssize_t show_cidmode(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t show_cidmode(struct class_device *class, char *buf) { int ret; unsigned long flags; - struct cardstate *cs = dev_get_drvdata(dev); + struct cardstate *cs = class_get_devdata(class); spin_lock_irqsave(&cs->lock, flags); ret = sprintf(buf, "%u\n", cs->cidmode); @@ -30,10 +29,10 @@ static ssize_t show_cidmode(struct devic return ret; } -static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr, +static ssize_t set_cidmode(struct class_device *class, const char *buf, size_t count) { - struct cardstate *cs = dev_get_drvdata(dev); + struct cardstate *cs = class_get_devdata(class); long int value; char *end; @@ -65,25 +64,25 @@ static ssize_t set_cidmode(struct device return count; } -static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode); +static CLASS_DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode); /* free sysfs for device */ void gigaset_free_dev_sysfs(struct cardstate *cs) { - if (!cs->tty_dev) + if (!cs->class) return; gig_dbg(DEBUG_INIT, "removing sysfs entries"); - device_remove_file(cs->tty_dev, &dev_attr_cidmode); + class_device_remove_file(cs->class, &class_device_attr_cidmode); } /* initialize sysfs for device */ void gigaset_init_dev_sysfs(struct cardstate *cs) { - if (!cs->tty_dev) + if (!cs->class) return; gig_dbg(DEBUG_INIT, "setting up sysfs"); - if (device_create_file(cs->tty_dev, &dev_attr_cidmode)) + if (class_device_create_file(cs->class, &class_device_attr_cidmode)) dev_err(cs->dev, "could not create sysfs attribute\n"); } diff -puN include/linux/tty.h~revert-gregkh-driver-tty-device include/linux/tty.h --- a/include/linux/tty.h~revert-gregkh-driver-tty-device +++ a/include/linux/tty.h @@ -276,8 +276,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 struct device *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); _