amdkfd: Fix sparse warnings in kfd_topology.c
authorOded Gabbay <oded.gabbay@amd.com>
Thu, 20 Nov 2014 13:41:33 +0000 (15:41 +0200)
committerOded Gabbay <oded.gabbay@amd.com>
Thu, 20 Nov 2014 13:41:33 +0000 (15:41 +0200)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
drivers/gpu/drm/amd/amdkfd/kfd_topology.c

index 77cd7d55b39d61f865d0010f736f878291ddbad8..5733e2859e8aabbc361ce821f5e337c0008dd6a3 100644 (file)
@@ -96,7 +96,7 @@ static int kfd_topology_get_crat_acpi(void *crat_image, size_t *size)
                return -EINVAL;
        }
 
-       if (*size >= crat_table->length && crat_image != 0)
+       if (*size >= crat_table->length && crat_image != NULL)
                memcpy(crat_image, crat_table, crat_table->length);
 
        *size = crat_table->length;
@@ -183,7 +183,7 @@ static int kfd_parse_subtype_mem(struct crat_subtype_memory *mem)
        list_for_each_entry(dev, &topology_device_list, list) {
                if (mem->promixity_domain == i) {
                        props = kfd_alloc_struct(props);
-                       if (props == 0)
+                       if (props == NULL)
                                return -ENOMEM;
 
                        if (dev->node_props.cpu_cores_count == 0)
@@ -231,7 +231,7 @@ static int kfd_parse_subtype_cache(struct crat_subtype_cache *cache)
                if (id == dev->node_props.cpu_core_id_base ||
                    id == dev->node_props.simd_id_base) {
                        props = kfd_alloc_struct(props);
-                       if (props == 0)
+                       if (props == NULL)
                                return -ENOMEM;
 
                        props->processor_id_low = id;
@@ -282,7 +282,7 @@ static int kfd_parse_subtype_iolink(struct crat_subtype_iolink *iolink)
        list_for_each_entry(dev, &topology_device_list, list) {
                if (id_from == i) {
                        props = kfd_alloc_struct(props);
-                       if (props == 0)
+                       if (props == NULL)
                                return -ENOMEM;
 
                        props->node_from = id_from;
@@ -415,9 +415,9 @@ static struct kfd_topology_device *kfd_create_topology_device(void)
        struct kfd_topology_device *dev;
 
        dev = kfd_alloc_struct(dev);
-       if (dev == 0) {
+       if (dev == NULL) {
                pr_err("No memory to allocate a topology device");
-               return 0;
+               return NULL;
        }
 
        INIT_LIST_HEAD(&dev->mem_props);
@@ -428,7 +428,7 @@ static struct kfd_topology_device *kfd_create_topology_device(void)
        sys_props.num_devices++;
 
        return dev;
-       }
+}
 
 static int kfd_parse_crat_table(void *crat_image)
 {
@@ -752,11 +752,11 @@ static void kfd_remove_sysfs_node_entry(struct kfd_topology_device *dev)
                        if (iolink->kobj) {
                                kfd_remove_sysfs_file(iolink->kobj,
                                                        &iolink->attr);
-                               iolink->kobj = 0;
+                               iolink->kobj = NULL;
                        }
                kobject_del(dev->kobj_iolink);
                kobject_put(dev->kobj_iolink);
-               dev->kobj_iolink = 0;
+               dev->kobj_iolink = NULL;
        }
 
        if (dev->kobj_cache) {
@@ -764,22 +764,22 @@ static void kfd_remove_sysfs_node_entry(struct kfd_topology_device *dev)
                        if (cache->kobj) {
                                kfd_remove_sysfs_file(cache->kobj,
                                                        &cache->attr);
-                               cache->kobj = 0;
+                               cache->kobj = NULL;
                        }
                kobject_del(dev->kobj_cache);
                kobject_put(dev->kobj_cache);
-               dev->kobj_cache = 0;
+               dev->kobj_cache = NULL;
        }
 
        if (dev->kobj_mem) {
                list_for_each_entry(mem, &dev->mem_props, list)
                        if (mem->kobj) {
                                kfd_remove_sysfs_file(mem->kobj, &mem->attr);
-                               mem->kobj = 0;
+                               mem->kobj = NULL;
                        }
                kobject_del(dev->kobj_mem);
                kobject_put(dev->kobj_mem);
-               dev->kobj_mem = 0;
+               dev->kobj_mem = NULL;
        }
 
        if (dev->kobj_node) {
@@ -788,7 +788,7 @@ static void kfd_remove_sysfs_node_entry(struct kfd_topology_device *dev)
                sysfs_remove_file(dev->kobj_node, &dev->attr_props);
                kobject_del(dev->kobj_node);
                kobject_put(dev->kobj_node);
-               dev->kobj_node = 0;
+               dev->kobj_node = NULL;
        }
 }
 
@@ -939,7 +939,7 @@ static int kfd_topology_update_sysfs(void)
        int ret;
 
        pr_info("Creating topology SYSFS entries\n");
-       if (sys_props.kobj_topology == 0) {
+       if (sys_props.kobj_topology == NULL) {
                sys_props.kobj_topology =
                                kfd_alloc_struct(sys_props.kobj_topology);
                if (!sys_props.kobj_topology)
@@ -989,17 +989,17 @@ static void kfd_topology_release_sysfs(void)
                if (sys_props.kobj_nodes) {
                        kobject_del(sys_props.kobj_nodes);
                        kobject_put(sys_props.kobj_nodes);
-                       sys_props.kobj_nodes = 0;
+                       sys_props.kobj_nodes = NULL;
                }
                kobject_del(sys_props.kobj_topology);
                kobject_put(sys_props.kobj_topology);
-               sys_props.kobj_topology = 0;
+               sys_props.kobj_topology = NULL;
        }
 }
 
 int kfd_topology_init(void)
 {
-       void *crat_image = 0;
+       void *crat_image = NULL;
        size_t image_size = 0;
        int ret;
 
@@ -1094,12 +1094,12 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu)
 static struct kfd_topology_device *kfd_assign_gpu(struct kfd_dev *gpu)
 {
        struct kfd_topology_device *dev;
-       struct kfd_topology_device *out_dev = 0;
+       struct kfd_topology_device *out_dev = NULL;
 
        BUG_ON(!gpu);
 
        list_for_each_entry(dev, &topology_device_list, list)
-               if (dev->gpu == 0 && dev->node_props.simd_count > 0) {
+               if (dev->gpu == NULL && dev->node_props.simd_count > 0) {
                        dev->gpu = gpu;
                        out_dev = dev;
                        break;