From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH 3/4] drm/i915/params: use generics for parameter free
Date: Wed, 18 Jan 2023 17:17:59 +0200 [thread overview]
Message-ID: <20230118151800.3669913-3-jani.nikula@intel.com> (raw)
In-Reply-To: <20230118151800.3669913-1-jani.nikula@intel.com>
Replace the __builtin_strcmp() if ladder with generics.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_params.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index f9d92d0ab2b5..ade744cccfea 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -296,18 +296,21 @@ void i915_params_copy(struct i915_params *dest, const struct i915_params *src)
#undef DUP
}
-static __always_inline void free_param(const char *type, void *x)
+static void _param_free_charp(char **valp)
{
- if (!__builtin_strcmp(type, "char *")) {
- kfree(*(void **)x);
- *(void **)x = NULL;
- }
+ kfree(*valp);
+ *valp = NULL;
}
+#define _param_free(valp) \
+ _Generic(valp, \
+ char **: _param_free_charp, \
+ default: _param_nop)(valp)
+
/* 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);
+#define FREE(T, x, ...) _param_free(¶ms->x);
I915_PARAMS_FOR_EACH(FREE);
#undef FREE
}
--
2.34.1
next prev parent reply other threads:[~2023-01-18 15:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 15:17 [Intel-gfx] [PATCH 1/4] drm/i915/params: use generics for parameter printing Jani Nikula
2023-01-18 15:17 ` [Intel-gfx] [PATCH 2/4] drm/i915/params: use generics for parameter dup Jani Nikula
2023-01-18 15:17 ` Jani Nikula [this message]
2023-01-18 15:18 ` [Intel-gfx] [PATCH 4/4] drm/i915/params: use generics for parameter debugfs file creation Jani Nikula
2023-01-18 23:12 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915/params: use generics for parameter printing Patchwork
2023-01-19 20:10 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-01-25 13:22 ` [Intel-gfx] [PATCH 1/4] " Luca Coelho
2023-01-25 14:28 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230118151800.3669913-3-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox