diff mbox series

drm/xe: avoid function cast warnings

Message ID 20240213095719.454865-1-arnd@kernel.org
State New
Headers
Series drm/xe: avoid function cast warnings |

Commit Message

Arnd Bergmann Feb. 13, 2024, 9:56 a.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

clang-16 warns about a cast between incompatible function types:

drivers/gpu/drm/xe/xe_range_fence.c:155:10: error: cast from 'void (*)(const void *)' to 'void (*)(struct xe_range_fence *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
  155 |         .free = (void (*)(struct xe_range_fence *rfence)) kfree,
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Avoid this with a trivial helper function that calls kfree() here.

Fixes: 845f64bdbfc9 ("drm/xe: Introduce a range-fence utility")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/xe/xe_range_fence.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Thomas Hellström Feb. 13, 2024, 10:04 a.m. UTC | #1 
On Tue, 2024-02-13 at 10:56 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> clang-16 warns about a cast between incompatible function types:
> 
> drivers/gpu/drm/xe/xe_range_fence.c:155:10: error: cast from 'void
> (*)(const void *)' to 'void (*)(struct xe_range_fence *)' converts to
> incompatible function type [-Werror,-Wcast-function-type-strict]
>   155 |         .free = (void (*)(struct xe_range_fence *rfence))
> kfree,
>       |                
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Avoid this with a trivial helper function that calls kfree() here.
> 
> Fixes: 845f64bdbfc9 ("drm/xe: Introduce a range-fence utility")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks, will push as soon as it passes CI.

Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> ---
>  drivers/gpu/drm/xe/xe_range_fence.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_range_fence.c
> b/drivers/gpu/drm/xe/xe_range_fence.c
> index d35d9ec58e86..8510be4466eb 100644
> --- a/drivers/gpu/drm/xe/xe_range_fence.c
> +++ b/drivers/gpu/drm/xe/xe_range_fence.c
> @@ -151,6 +151,11 @@ xe_range_fence_tree_next(struct xe_range_fence
> *rfence, u64 start, u64 last)
>  	return xe_range_fence_tree_iter_next(rfence, start, last);
>  }
>  
> +static void xe_range_fence_free(struct xe_range_fence * rfence)
> +{
> +	kfree(rfence);
> +}
> +
>  const struct xe_range_fence_ops xe_range_fence_kfree_ops = {
> -	.free = (void (*)(struct xe_range_fence *rfence)) kfree,
> +	.free = xe_range_fence_free,
>  };
Thomas Hellström Feb. 14, 2024, 10:10 a.m. UTC | #2 
Hi,

On Tue, 2024-02-13 at 10:56 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> clang-16 warns about a cast between incompatible function types:
> 
> drivers/gpu/drm/xe/xe_range_fence.c:155:10: error: cast from 'void
> (*)(const void *)' to 'void (*)(struct xe_range_fence *)' converts to
> incompatible function type [-Werror,-Wcast-function-type-strict]
>   155 |         .free = (void (*)(struct xe_range_fence *rfence))
> kfree,
>       |                
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Avoid this with a trivial helper function that calls kfree() here.
> 
> Fixes: 845f64bdbfc9 ("drm/xe: Introduce a range-fence utility")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpu/drm/xe/xe_range_fence.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_range_fence.c
> b/drivers/gpu/drm/xe/xe_range_fence.c
> index d35d9ec58e86..8510be4466eb 100644
> --- a/drivers/gpu/drm/xe/xe_range_fence.c
> +++ b/drivers/gpu/drm/xe/xe_range_fence.c
> @@ -151,6 +151,11 @@ xe_range_fence_tree_next(struct xe_range_fence
> *rfence, u64 start, u64 last)
>  	return xe_range_fence_tree_iter_next(rfence, start, last);
>  }
>  
> +static void xe_range_fence_free(struct xe_range_fence * rfence)

There's a checkpatch.pl style error above: s/* rfence/*rfence/. I can
fix that up when pushing if it's ok with you.

/Thomas


> +{
> +	kfree(rfence);
> +}
> +
>  const struct xe_range_fence_ops xe_range_fence_kfree_ops = {
> -	.free = (void (*)(struct xe_range_fence *rfence)) kfree,
> +	.free = xe_range_fence_free,
>  };
Arnd Bergmann Feb. 14, 2024, 10:15 a.m. UTC | #3 
On Wed, Feb 14, 2024, at 11:10, Thomas Hellström wrote:
> On Tue, 2024-02-13 at 10:56 +0100, Arnd Bergmann wrote:
>>  
>> +static void xe_range_fence_free(struct xe_range_fence * rfence)
>
> There's a checkpatch.pl style error above: s/* rfence/*rfence/. I can
> fix that up when pushing if it's ok with you.

Right, I saw the report. Please fix it up then so I don't have
to resubmit. Thanks,

    Arnd
diff mbox series

Patch

diff --git a/drivers/gpu/drm/xe/xe_range_fence.c b/drivers/gpu/drm/xe/xe_range_fence.c
index d35d9ec58e86..8510be4466eb 100644
--- a/drivers/gpu/drm/xe/xe_range_fence.c
+++ b/drivers/gpu/drm/xe/xe_range_fence.c
@@ -151,6 +151,11 @@  xe_range_fence_tree_next(struct xe_range_fence *rfence, u64 start, u64 last)
 	return xe_range_fence_tree_iter_next(rfence, start, last);
 }
 
+static void xe_range_fence_free(struct xe_range_fence * rfence)
+{
+	kfree(rfence);
+}
+
 const struct xe_range_fence_ops xe_range_fence_kfree_ops = {
-	.free = (void (*)(struct xe_range_fence *rfence)) kfree,
+	.free = xe_range_fence_free,
 };