X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fgpu%2Farm%2Fmidgard%2Fmali_kbase_mem_profile_debugfs.c;h=092da9a96ea56b37f68673079108deb6efe298ca;hb=3054c50dd886faa349ca38c9ad8c2162f9706d5a;hp=a443d002a1aca09b00fe9cf732a7bdf7f59812e5;hpb=b096c7187a357f977364e5e41fd0e3ddfc4320a0;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c
index a443d002a1ac..092da9a96ea5 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_profile_debugfs.c
@@ -1,6 +1,6 @@
 /*
  *
- * (C) COPYRIGHT 2012-2015 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2012-2016 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -15,7 +15,7 @@
 
 
 
-#include <mali_kbase_gpu_memory_debugfs.h>
+#include <mali_kbase.h>
 
 #ifdef CONFIG_DEBUG_FS
 
@@ -32,18 +32,16 @@
 static int kbasep_mem_profile_seq_show(struct seq_file *sfile, void *data)
 {
 	struct kbase_context *kctx = sfile->private;
-	int err = 0;
 
 	mutex_lock(&kctx->mem_profile_lock);
 
-	err = seq_write(sfile, kctx->mem_profile_data, kctx->mem_profile_size);
+	seq_write(sfile, kctx->mem_profile_data, kctx->mem_profile_size);
 
-	if (!err)
-		err = seq_putc(sfile, '\n');
+	seq_putc(sfile, '\n');
 
 	mutex_unlock(&kctx->mem_profile_lock);
 
-	return err;
+	return 0;
 }
 
 /*
@@ -69,26 +67,27 @@ int kbasep_mem_profile_debugfs_insert(struct kbase_context *kctx, char *data,
 	mutex_lock(&kctx->mem_profile_lock);
 
 	dev_dbg(kctx->kbdev->dev, "initialised: %d",
-				kctx->mem_profile_initialized);
+		kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED));
 
-	if (!kctx->mem_profile_initialized) {
+	if (!kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)) {
 		if (!debugfs_create_file("mem_profile", S_IRUGO,
 					kctx->kctx_dentry, kctx,
 					&kbasep_mem_profile_debugfs_fops)) {
 			err = -EAGAIN;
 		} else {
-			kctx->mem_profile_initialized = true;
+			kbase_ctx_flag_set(kctx,
+					   KCTX_MEM_PROFILE_INITIALIZED);
 		}
 	}
 
-	if (kctx->mem_profile_initialized) {
+	if (kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED)) {
 		kfree(kctx->mem_profile_data);
 		kctx->mem_profile_data = data;
 		kctx->mem_profile_size = size;
 	}
 
 	dev_dbg(kctx->kbdev->dev, "returning: %d, initialised: %d",
-				err, kctx->mem_profile_initialized);
+		err, kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED));
 
 	mutex_unlock(&kctx->mem_profile_lock);
 
@@ -100,7 +99,7 @@ void kbasep_mem_profile_debugfs_remove(struct kbase_context *kctx)
 	mutex_lock(&kctx->mem_profile_lock);
 
 	dev_dbg(kctx->kbdev->dev, "initialised: %d",
-				kctx->mem_profile_initialized);
+				kbase_ctx_flag(kctx, KCTX_MEM_PROFILE_INITIALIZED));
 
 	kfree(kctx->mem_profile_data);
 	kctx->mem_profile_data = NULL;