nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra: Fix redefinition error for Linux v6.11

Browse Source 
In Linux v6.11, commit 1a251f52cfdc ("minmax: make generic MIN() and
MAX() macros available everywhere") causes the Tegra ASoC Utils driver
build to fail with the following error:

 sound/soc/tegra/tegra_asoc_utils.c:18: error: "MAX" redefined [-Werror]
  18 | #define MAX(X, Y) ((X > Y) ? (X) : (Y))

Fix this by add guards around the definition of 'MAX' in the
Tegra ASoC Utils file.

Bug 4749580

Change-Id: I63df434627e6ee7ab16d865c296b07b91405fdfd
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3185143
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2024-07-30 17:48:15 +01:00
committed by mobile promotions
parent 8fbb56adb6
commit 8f4ee697f9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/tegra/tegra_asoc_utils.c
View File

@@ -3,7 +3,7 @@
* tegra_asoc_utils.c - Harmony machine ASoC driver * tegra_asoc_utils.c - Harmony machine ASoC driver
* *
* Author: Stephen Warren <swarren@nvidia.com> * Author: Stephen Warren <swarren@nvidia.com>
* Copyright (c) 2010-2023 NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2010-2024 NVIDIA CORPORATION. All rights reserved.
*/ */
#include <linux/clk.h> #include <linux/clk.h>
@@ -15,7 +15,9 @@
#include "tegra_asoc_utils.h" #include "tegra_asoc_utils.h"
#ifndef MAX
#define MAX(X, Y) ((X > Y) ? (X) : (Y)) #define MAX(X, Y) ((X > Y) ? (X) : (Y))
#endif
/* /*
* this will be used for platforms from Tegra210 onwards. * this will be used for platforms from Tegra210 onwards.
* odd rates: sample rates multiple of 11.025kHz * odd rates: sample rates multiple of 11.025kHz