2018-02-22 11:10:14

by Yisheng Xie

Subject: [PATCH -next 1/2] staging: android: ion: Remove check of debug_file

There's no need to check the return value of debug_file for it is just a
debugfs and we will go on the following process if we failed to create
debug_file. So just remove it.

Signed-off-by: Yisheng Xie <[email protected]>
---
drivers/staging/android/ion/ion.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 74d9a4e..0606d50 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -522,7 +522,6 @@ static int debug_shrink_get(void *data, u64 *val)

void ion_device_add_heap(struct ion_heap *heap)
{
- struct dentry *debug_file;
struct ion_device *dev = internal_dev;
int ret;

@@ -556,12 +555,8 @@ void ion_device_add_heap(struct ion_heap *heap)
char debug_name[64];

snprintf(debug_name, 64, "%s_shrink", heap->name);
- debug_file = debugfs_create_file(debug_name,
- 0644, dev->debug_root, heap,
- &debug_shrink_fops);
- if (!debug_file)
- pr_err("Failed to create ion heap shrinker debugfs at %s\n",
- debug_name);
+ debugfs_create_file(debug_name, 0644, dev->debug_root,
+ heap, &debug_shrink_fops);
}

dev->heap_cnt++;
--
1.7.12.4

2018-02-22 11:09:14

by Yisheng Xie

Subject: [PATCH -next 2/2] staging: android: ion: Remove check of idev->debug_root

We will go on initial idev if failed to create debug_root, and it does
not matter to check the return value of this debugfs call, just remove it.

Signed-off-by: Yisheng Xie <[email protected]>
---
drivers/staging/android/ion/ion.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 0606d50..e74db79 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -585,9 +585,6 @@ static int ion_device_create(void)
}

idev->debug_root = debugfs_create_dir("ion", NULL);
- if (!idev->debug_root)
- pr_err("ion: failed to create debugfs root directory.\n");
-
idev->buffers = RB_ROOT;
mutex_init(&idev->buffer_lock);
init_rwsem(&idev->lock);
--
1.7.12.4