diff mbox series

drm/tegra: Fix compilation of variadic macro

Message ID 20210716124600.507871-1-jonathanh@nvidia.com
State Accepted
Headers show
Series drm/tegra: Fix compilation of variadic macro | expand

Commit Message

Jon Hunter July 16, 2021, 12:46 p.m. UTC
Commit 43636451db8c ("drm/tegra: Implement job submission part of new
UAPI") added the macro 'SUBMIT_ERR' that in turns makes use of the macro
'__VA_OPT__'. The '__VA_OPT__' macro is not supported by older versions
of GCC and so causes build failures when using older versions of GCC.
Fix this by using the '##__VA_ARGS__' macro instead.

Fixes: 43636451db8c ("drm/tegra: Implement job submission part of new UAPI")
Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/gpu/drm/tegra/submit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mikko Perttunen July 16, 2021, 1:01 p.m. UTC | #1
On 7/16/21 3:46 PM, Jon Hunter wrote:
> Commit 43636451db8c ("drm/tegra: Implement job submission part of new
> UAPI") added the macro 'SUBMIT_ERR' that in turns makes use of the macro
> '__VA_OPT__'. The '__VA_OPT__' macro is not supported by older versions
> of GCC and so causes build failures when using older versions of GCC.
> Fix this by using the '##__VA_ARGS__' macro instead.
> 
> Fixes: 43636451db8c ("drm/tegra: Implement job submission part of new UAPI")
> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>   drivers/gpu/drm/tegra/submit.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/tegra/submit.c b/drivers/gpu/drm/tegra/submit.c
> index c53b7207c478..e49630089149 100644
> --- a/drivers/gpu/drm/tegra/submit.c
> +++ b/drivers/gpu/drm/tegra/submit.c
> @@ -24,7 +24,7 @@
>   #define SUBMIT_ERR(context, fmt, ...) \
>   	dev_err_ratelimited(context->client->base.dev, \
>   		"%s: job submission failed: " fmt "\n", \
> -		current->comm __VA_OPT__(,) __VA_ARGS__)
> +		current->comm, ##__VA_ARGS__)
>   
>   static struct tegra_drm_mapping *
>   tegra_drm_mapping_get(struct tegra_drm_context *context, u32 id)
> 

Thanks for taking care of this.

Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Thierry Reding July 16, 2021, 11:22 p.m. UTC | #2
On Fri, Jul 16, 2021 at 01:46:00PM +0100, Jon Hunter wrote:
> Commit 43636451db8c ("drm/tegra: Implement job submission part of new
> UAPI") added the macro 'SUBMIT_ERR' that in turns makes use of the macro
> '__VA_OPT__'. The '__VA_OPT__' macro is not supported by older versions
> of GCC and so causes build failures when using older versions of GCC.
> Fix this by using the '##__VA_ARGS__' macro instead.
> 
> Fixes: 43636451db8c ("drm/tegra: Implement job submission part of new UAPI")
> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>  drivers/gpu/drm/tegra/submit.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thierry
diff mbox series

Patch

diff --git a/drivers/gpu/drm/tegra/submit.c b/drivers/gpu/drm/tegra/submit.c
index c53b7207c478..e49630089149 100644
--- a/drivers/gpu/drm/tegra/submit.c
+++ b/drivers/gpu/drm/tegra/submit.c
@@ -24,7 +24,7 @@ 
 #define SUBMIT_ERR(context, fmt, ...) \
 	dev_err_ratelimited(context->client->base.dev, \
 		"%s: job submission failed: " fmt "\n", \
-		current->comm __VA_OPT__(,) __VA_ARGS__)
+		current->comm, ##__VA_ARGS__)
 
 static struct tegra_drm_mapping *
 tegra_drm_mapping_get(struct tegra_drm_context *context, u32 id)