staging: ozwpan: Unregister with sysfs while unloading.
authorRupesh Gujare <rgujare@ozmodevices.com>
Tue, 26 Jun 2012 12:03:39 +0000 (13:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Jun 2012 22:07:56 +0000 (15:07 -0700)
Destroy device node & unregister device class from sysfs while unloading
driver

Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ozwpan/ozcdev.c

index 929756abf02c007554be5218af356779d4593100..d98321945802c8daf8ec71cc3908ec0c44133c7a 100644 (file)
@@ -42,6 +42,7 @@ struct oz_serial_ctx {
 /*------------------------------------------------------------------------------
  */
 static struct oz_cdev g_cdev;
+struct class *g_oz_class;
 /*------------------------------------------------------------------------------
  * Context: process and softirq
  */
@@ -330,7 +331,6 @@ const struct file_operations oz_fops = {
 int oz_cdev_register(void)
 {
        int err;
-       struct class *cl;
        struct device *dev;
        memset(&g_cdev, 0, sizeof(g_cdev));
        err = alloc_chrdev_region(&g_cdev.devnum, 0, 1, "ozwpan");
@@ -348,12 +348,12 @@ int oz_cdev_register(void)
                oz_trace("Failed to add cdev\n");
                goto out2;
        }
-       cl = class_create(THIS_MODULE, "ozmo_wpan");
-       if (IS_ERR(cl)) {
+       g_oz_class = class_create(THIS_MODULE, "ozmo_wpan");
+       if (IS_ERR(g_oz_class)) {
                oz_trace("Failed to register ozmo_wpan class\n");
                goto out1;
        }
-       dev = device_create(cl, NULL, g_cdev.devnum, NULL, "ozwpan");
+       dev = device_create(g_oz_class, NULL, g_cdev.devnum, NULL, "ozwpan");
        if (IS_ERR(dev)) {
                oz_trace("Failed to create sysfs entry for cdev\n");
                goto out1;
@@ -373,6 +373,10 @@ int oz_cdev_deregister(void)
 {
        cdev_del(&g_cdev.cdev);
        unregister_chrdev_region(g_cdev.devnum, 1);
+       if (g_oz_class) {
+               device_destroy(g_oz_class, g_cdev.devnum);
+               class_destroy(g_oz_class);
+       }
        return 0;
 }
 /*------------------------------------------------------------------------------