video: tegra: nvmap: rename function
Alex Waterman [Wed, 28 Aug 2013 21:46:36 +0000 (14:46 -0700)]
Rename _nvmap_validate_id_locked() to __nvmap_validate_id_locked().

Change-Id: I7d781d4538015e8d1974bb6104e22f41c8d5cf00
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/267558
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>

drivers/video/tegra/nvmap/nvmap.c
drivers/video/tegra/nvmap/nvmap_dev.c
drivers/video/tegra/nvmap/nvmap_handle.c
drivers/video/tegra/nvmap/nvmap_ioctl.c
drivers/video/tegra/nvmap/nvmap_priv.h

index 3e58c50..2fa2334 100644 (file)
@@ -240,7 +240,7 @@ void nvmap_unpin_ids(struct nvmap_client *client,
                        continue;
 
                nvmap_ref_lock(client);
-               ref = _nvmap_validate_id_locked(client, ids[i]);
+               ref = __nvmap_validate_id_locked(client, ids[i]);
                if (ref) {
                        struct nvmap_handle *h = ref->handle;
                        int e = atomic_add_unless(&ref->pin, -1, 0);
@@ -290,7 +290,7 @@ int nvmap_pin_ids(struct nvmap_client *client,
         * will be permanently leaked. */
        nvmap_ref_lock(client);
        for (i = 0; i < nr; i++) {
-               ref = _nvmap_validate_id_locked(client, ids[i]);
+               ref = __nvmap_validate_id_locked(client, ids[i]);
                if (ref) {
                        atomic_inc(&ref->pin);
                        nvmap_handle_get(h[i]);
@@ -347,7 +347,7 @@ out:
                        if (!ids[i])
                                continue;
 
-                       ref = _nvmap_validate_id_locked(client, ids[i]);
+                       ref = __nvmap_validate_id_locked(client, ids[i]);
                        if (!ref) {
                                nvmap_warn(client, "%s freed handle %p "
                                           "during pinning\n",
@@ -465,7 +465,7 @@ int nvmap_pin(struct nvmap_client *client, struct nvmap_handle_ref *ref,
                return -EINVAL;
 
        nvmap_ref_lock(client);
-       ref = _nvmap_validate_id_locked(client, (unsigned long)ref->handle);
+       ref = __nvmap_validate_id_locked(client, (unsigned long)ref->handle);
        if (ref)
                h = ref->handle;
        nvmap_ref_unlock(client);
index fb1ef84..a71864f 100644 (file)
@@ -236,8 +236,8 @@ pte_t **nvmap_vaddr_to_pte(struct nvmap_device *dev, unsigned long vaddr)
 
 /* verifies that the handle ref value "ref" is a valid handle ref for the
  * file. caller must hold the file's ref_lock prior to calling this function */
-struct nvmap_handle_ref *_nvmap_validate_id_locked(struct nvmap_client *c,
-                                                  unsigned long id)
+struct nvmap_handle_ref *__nvmap_validate_id_locked(struct nvmap_client *c,
+                                                   unsigned long id)
 {
        struct rb_node *n = c->handle_refs.rb_node;
 
@@ -262,7 +262,7 @@ struct nvmap_handle *nvmap_get_handle_id(struct nvmap_client *client,
        struct nvmap_handle *h = NULL;
 
        nvmap_ref_lock(client);
-       ref = _nvmap_validate_id_locked(client, id);
+       ref = __nvmap_validate_id_locked(client, id);
        if (ref)
                h = ref->handle;
        if (h)
index 78c26f9..dcd54fd 100644 (file)
@@ -928,7 +928,7 @@ void nvmap_free_handle_id(struct nvmap_client *client, unsigned long id)
 
        nvmap_ref_lock(client);
 
-       ref = _nvmap_validate_id_locked(client, id);
+       ref = __nvmap_validate_id_locked(client, id);
        if (!ref) {
                nvmap_ref_unlock(client);
                return;
@@ -1081,7 +1081,7 @@ struct nvmap_handle_ref *nvmap_duplicate_handle_id(struct nvmap_client *client,
        }
 
        nvmap_ref_lock(client);
-       ref = _nvmap_validate_id_locked(client, (unsigned long)h);
+       ref = __nvmap_validate_id_locked(client, (unsigned long)h);
 
        if (ref) {
                /* handle already duplicated in client; just increment
@@ -1244,7 +1244,7 @@ int nvmap_acquire_page_list(struct nvmap_client *client,
                pages[idx] = h->pgalloc.pages[idx];
 
        nvmap_ref_lock(client);
-       ref = _nvmap_validate_id_locked(client, id);
+       ref = __nvmap_validate_id_locked(client, id);
        if (ref)
                nvmap_pin(client, ref, &dummy);
        nvmap_ref_unlock(client);
@@ -1262,7 +1262,7 @@ int nvmap_release_page_list(struct nvmap_client *client, unsigned long id)
 
        nvmap_ref_lock(client);
 
-       ref = _nvmap_validate_id_locked(client, id);
+       ref = __nvmap_validate_id_locked(client, id);
        if (ref)
                nvmap_unpin(client, ref);
 
index bed85de..f123421 100644 (file)
@@ -507,7 +507,7 @@ int nvmap_ioctl_get_param(struct file *filp, void __user* arg)
                return -EINVAL;
 
        nvmap_ref_lock(client);
-       ref = _nvmap_validate_id_locked(client, handle);
+       ref = __nvmap_validate_id_locked(client, handle);
        if (IS_ERR_OR_NULL(ref)) {
                err = ref ? PTR_ERR(ref) : -EINVAL;
                goto ref_fail;
index 39b4264..fcd16a3 100644 (file)
@@ -289,7 +289,7 @@ struct nvmap_handle *nvmap_get_handle_id(struct nvmap_client *client,
 
 void nvmap_handle_put(struct nvmap_handle *h);
 
-struct nvmap_handle_ref *_nvmap_validate_id_locked(struct nvmap_client *priv,
+struct nvmap_handle_ref *__nvmap_validate_id_locked(struct nvmap_client *priv,
                                                   unsigned long id);
 
 struct nvmap_handle_ref *nvmap_create_handle(struct nvmap_client *client,