History

drm/msm: Restore second parameter name in purge() and evict()

After commit 3392291fc509 ("drm/msm: Fix shrinker deadlock"), all supported versions of clang warn (or error with CONFIG_WERROR=y): drivers/gpu/drm/msm/msm_gem_shrinker.c:105:58: error: omitting the parameter name in a function definition is a C23 extension [-Werror,-Wc23-extensions] 105 | purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) | ^ drivers/gpu/drm/msm/msm_gem_shrinker.c:117:58: error: omitting the parameter name in a function definition is a C23 extension [-Werror,-Wc23-extensions] 117 | evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) | ^ 2 errors generated. With older but supported versions of GCC, this is an unconditional hard error: drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'purge': drivers/gpu/drm/msm/msm_gem_shrinker.c:105:35: error: parameter name omitted purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) ^~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/msm/msm_gem_shrinker.c: In function 'evict': drivers/gpu/drm/msm/msm_gem_shrinker.c:117:35: error: parameter name omitted evict(struct drm_gem_object *obj, struct ww_acquire_ctx *) ^~~~~~~~~~~~~~~~~~~~~~~ Restore the parameter name to clear up the warnings, renaming it "unused" to make it clear it is only needed to satisfy the prototype of drm_gem_lru_scan().

Nathan Chancellor committed 6 months ago

Commit 53676e41 parent f0e77c51 file · +2 −2Browse files

Unified · Split

drivers/gpu/drm/msm/msm_gem_shrinker.c+2−2
@@ -102,7 +102,7 @@ out_unlock: · 101 unmodified lines
102}102}
103 103
104static bool104static bool
105purge(struct drm_gem_object *obj, struct ww_acquire_ctx *)105purge(struct drm_gem_object *obj, struct ww_acquire_ctx *unused)
106{106{
107 if (!is_purgeable(to_msm_bo(obj)))107 if (!is_purgeable(to_msm_bo(obj)))
108 return false;108 return false;
@@ -114,7 +114,7 @@ purge(struct drm_gem_object *obj, struct ww_acquire_ctx *) · 5 unmodified lines
114}114}
115 115
116static bool116static bool
117evict(struct drm_gem_object *obj, struct ww_acquire_ctx *)117evict(struct drm_gem_object *obj, struct ww_acquire_ctx *unused)
118{118{
119 if (is_unevictable(to_msm_bo(obj)))119 if (is_unevictable(to_msm_bo(obj)))
120 return false;120 return false;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t