OSDN Git Service

drm/ttm: cleanup ttm_handle_caching_state_failure
authorChristian König <christian.koenig@amd.com>
Tue, 29 Sep 2020 15:32:35 +0000 (17:32 +0200)
committerChristian König <christian.koenig@amd.com>
Wed, 7 Oct 2020 08:41:23 +0000 (10:41 +0200)
Remove unused parameters, shorten the function name.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Link: https://patchwork.freedesktop.org/patch/393431/
drivers/gpu/drm/ttm/ttm_page_alloc.c

index 14660f7..6bd59c6 100644 (file)
@@ -466,11 +466,11 @@ static int ttm_set_pages_caching(struct page **pages,
  * any pages that have changed their caching state already put them to the
  * pool.
  */
-static void ttm_handle_caching_state_failure(struct list_head *pages,
-               int ttm_flags, enum ttm_caching_state cstate,
-               struct page **failed_pages, unsigned cpages)
+static void ttm_handle_caching_failure(struct page **failed_pages,
+                                      unsigned cpages)
 {
        unsigned i;
+
        /* Failed pages have to be freed */
        for (i = 0; i < cpages; ++i) {
                list_del(&failed_pages[i]->lru);
@@ -516,9 +516,8 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,
                                r = ttm_set_pages_caching(caching_array,
                                                          cstate, cpages);
                                if (r)
-                                       ttm_handle_caching_state_failure(pages,
-                                               ttm_flags, cstate,
-                                               caching_array, cpages);
+                                       ttm_handle_caching_failure(caching_array,
+                                                                  cpages);
                        }
                        r = -ENOMEM;
                        goto out;
@@ -541,9 +540,8 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,
                                r = ttm_set_pages_caching(caching_array,
                                                cstate, cpages);
                                if (r) {
-                                       ttm_handle_caching_state_failure(pages,
-                                               ttm_flags, cstate,
-                                               caching_array, cpages);
+                                       ttm_handle_caching_failure(caching_array,
+                                                                  cpages);
                                        goto out;
                                }
                                cpages = 0;
@@ -554,9 +552,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,
        if (cpages) {
                r = ttm_set_pages_caching(caching_array, cstate, cpages);
                if (r)
-                       ttm_handle_caching_state_failure(pages,
-                                       ttm_flags, cstate,
-                                       caching_array, cpages);
+                       ttm_handle_caching_failure(caching_array, cpages);
        }
 out:
        kfree(caching_array);