diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-12-27 16:33:38 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-12-31 15:27:00 +0200 |
| commit | 16cabb12f2cc40304dfce8c8eba169f044b64f02 (patch) | |
| tree | 271d06cc89ec46f5d0a1f2d5d24eee712dad1c7d | |
| parent | 4081cef923e0ac0bb4dbc24da838c91f2ea8d737 (diff) | |
| download | linux-16cabb12f2cc40304dfce8c8eba169f044b64f02.tar.gz linux-16cabb12f2cc40304dfce8c8eba169f044b64f02.tar.bz2 linux-16cabb12f2cc40304dfce8c8eba169f044b64f02.zip | |
drm/i915: add a helper to free the members of i915_params
Abstract the one user in anticipation of more. Set the dangling pointers
to NULL while at it.
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8637d1e5049dc003718772f19d664aeaf9540856.1545920737.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_params.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_params.h | 1 |
3 files changed, 18 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 8c04479c1586..2bd7991ec9af 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -963,17 +963,10 @@ static void i915_error_object_free(struct drm_i915_error_object *obj) kfree(obj); } -static __always_inline void free_param(const char *type, void *x) -{ - if (!__builtin_strcmp(type, "char *")) - kfree(*(void **)x); -} static void cleanup_params(struct i915_gpu_state *error) { -#define FREE(T, x, ...) free_param(#T, &error->params.x); - I915_PARAMS_FOR_EACH(FREE); -#undef FREE + i915_params_free(&error->params); } static void cleanup_uc_state(struct i915_gpu_state *error) diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index ae3ece4ec7ab..81c73bfc7991 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -217,3 +217,19 @@ void i915_params_copy(struct i915_params *dest, const struct i915_params *src) I915_PARAMS_FOR_EACH(DUP); #undef DUP } + +static __always_inline void free_param(const char *type, void *x) +{ + if (!__builtin_strcmp(type, "char *")) { + kfree(*(void **)x); + *(void **)x = NULL; + } +} + +/* free the allocated members, *not* the passed in params itself */ +void i915_params_free(struct i915_params *params) +{ +#define FREE(T, x, ...) free_param(#T, ¶ms->x); + I915_PARAMS_FOR_EACH(FREE); +#undef FREE +} diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h index fd1cf9415e60..93f665eced16 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h @@ -79,6 +79,7 @@ extern struct i915_params i915_modparams __read_mostly; void i915_params_dump(const struct i915_params *params, struct drm_printer *p); void i915_params_copy(struct i915_params *dest, const struct i915_params *src); +void i915_params_free(struct i915_params *params); #endif |