These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / android / sw_sync.c

diff --git a/kernel/drivers/staging/android/sw_sync.c b/kernel/drivers/staging/android/sw_sync.c
index c90838d..c4ff167 100644 (file)
--- a/kernel/drivers/staging/android/sw_sync.c
+++ b/kernel/drivers/staging/android/sw_sync.c
@@ -15,11 +15,11 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/export.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
-#include <linux/module.h>
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
 
@@ -145,7 +145,7 @@ static int sw_sync_open(struct inode *inode, struct file *file)
        get_task_comm(task_comm, current);
 
        obj = sw_sync_timeline_create(task_comm);
-       if (obj == NULL)
+       if (!obj)
                return -ENOMEM;
 
        file->private_data = obj;
@@ -179,14 +179,14 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj,
        }
 
        pt = sw_sync_pt_create(obj, data.value);
-       if (pt == NULL) {
+       if (!pt) {
                err = -ENOMEM;
                goto err;
        }
 
        data.name[sizeof(data.name) - 1] = '\0';
        fence = sync_fence_create(data.name, pt);
-       if (fence == NULL) {
+       if (!fence) {
                sync_pt_free(pt);
                err = -ENOMEM;
                goto err;
@@ -255,13 +255,6 @@ static int __init sw_sync_device_init(void)
 {
        return misc_register(&sw_sync_dev);
 }
-
-static void __exit sw_sync_device_remove(void)
-{
-       misc_deregister(&sw_sync_dev);
-}
-
-module_init(sw_sync_device_init);
-module_exit(sw_sync_device_remove);
+device_initcall(sw_sync_device_init);
 
 #endif /* CONFIG_SW_SYNC_USER */