Skip to content

Commit

Permalink
staging: ozwpan: Unregister with sysfs while unloading.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rupesh Gujare authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent f204739 commit ba0a7ae
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/staging/ozwpan/ozcdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ struct oz_serial_ctx {
/*------------------------------------------------------------------------------
*/
static struct oz_cdev g_cdev;
struct class *g_oz_class;
/*------------------------------------------------------------------------------
* Context: process and softirq
*/
Expand Down Expand Up @@ -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");
Expand All @@ -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;
Expand All @@ -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;
}
/*------------------------------------------------------------------------------
Expand Down

0 comments on commit ba0a7ae

Please sign in to comment.