[PATCH] class: convert drivers/* to use the new class api instead of class_simple

[net-next-2.6.git] / drivers / net / ppp_generic.c

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index ad4b58af6b76e75825ea8f55512c6386ba5774fa..ab726ab43798811bd28d76c293f4fc3564dff75a 100644 (file)
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -273,7 +273,7 @@ static int ppp_connect_channel(struct channel *pch, int unit);
 static int ppp_disconnect_channel(struct channel *pch);
 static void ppp_destroy_channel(struct channel *pch);
 
-static struct class_simple *ppp_class;
+static struct class *ppp_class;
 
 /* Translates a PPP protocol number to a NP index (NP == network protocol) */
 static inline int proto_to_npindex(int proto)
@@ -858,12 +858,12 @@ static int __init ppp_init(void)
        printk(KERN_INFO "PPP generic driver version " PPP_VERSION "\n");
        err = register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops);
        if (!err) {
-               ppp_class = class_simple_create(THIS_MODULE, "ppp");
+               ppp_class = class_create(THIS_MODULE, "ppp");
                if (IS_ERR(ppp_class)) {
                        err = PTR_ERR(ppp_class);
                        goto out_chrdev;
                }
-               class_simple_device_add(ppp_class, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
+               class_device_create(ppp_class, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
                err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),
                                S_IFCHR|S_IRUSR|S_IWUSR, "ppp");
                if (err)
@@ -876,8 +876,8 @@ out:
        return err;
 
 out_class:
-       class_simple_device_remove(MKDEV(PPP_MAJOR,0));
-       class_simple_destroy(ppp_class);
+       class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));
+       class_destroy(ppp_class);
 out_chrdev:
        unregister_chrdev(PPP_MAJOR, "ppp");
        goto out;
@@ -2654,8 +2654,8 @@ static void __exit ppp_cleanup(void)
        if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
                printk(KERN_ERR "PPP: failed to unregister PPP device\n");
        devfs_remove("ppp");
-       class_simple_device_remove(MKDEV(PPP_MAJOR, 0));
-       class_simple_destroy(ppp_class);
+       class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
+       class_destroy(ppp_class);
 }
 
 /*