gpu: ion: Remove heapmask from client
The heapmask in the client generally wasn't being used. This
patch removes it.
Change-Id: I18bcf11089a0bc20373327ffaead41f73e810e78
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Git-commit: cd56ef058fdf8aed9cf583e25c6e20308cd61521
Git-repo: https://android.googlesource.com/kernel/common
[lauraa@codeaurora.org: Dropped debugfs changes, adjusted
msm_ion_client_create for compilation purposes]
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c
index d9fdcf4..d5d759d 100644
--- a/drivers/gpu/ion/ion.c
+++ b/drivers/gpu/ion/ion.c
@@ -68,7 +68,6 @@
* @dev: backpointer to ion device
* @handles: an rb tree of all the handles in this client
* @lock: lock protecting the tree of handles
- * @heap_type_mask: mask of all supported heap types
* @name: used for debugging
* @task: used for debugging
*
@@ -406,9 +405,6 @@
down_read(&dev->lock);
plist_for_each_entry(heap, &dev->heaps, node) {
- /* if the client doesn't support this heap type */
- if (!((1 << heap->type) & client->heap_type_mask))
- continue;
/* if the caller didn't specify this heap id */
if (!((1 << heap->id) & heap_id_mask))
continue;
@@ -665,7 +661,6 @@
};
struct ion_client *ion_client_create(struct ion_device *dev,
- unsigned int heap_type_mask,
const char *name)
{
struct ion_client *client;
@@ -715,7 +710,6 @@
strlcpy(client->name, name, name_len+1);
}
- client->heap_type_mask = heap_type_mask;
client->task = task;
client->pid = pid;
@@ -1399,7 +1393,7 @@
pr_debug("%s: %d\n", __func__, __LINE__);
snprintf(debug_name, 64, "%u", task_pid_nr(current->group_leader));
- client = ion_client_create(dev, -1, debug_name);
+ client = ion_client_create(dev, debug_name);
if (IS_ERR_OR_NULL(client))
return PTR_ERR(client);
file->private_data = client;