[Sound-open-firmware] [PATCH] Don't call dma_trace_init_complete if dma trace is disabled.
Hide dma_trace_init_complete if --disable-dma-trace was passed to configure. Otherwise, the compile with fail.
Signed-off-by: Mike Mason michael.w.mason@intel.com --- src/platform/apollolake/platform.c | 2 ++ src/platform/baytrail/platform.c | 2 ++ src/platform/cannonlake/platform.c | 2 ++ src/platform/haswell/platform.c | 2 ++ 4 files changed, 8 insertions(+)
diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index 84f8e71..f601961 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -263,7 +263,9 @@ int platform_init(struct reef *reef) }
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; } diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index cec8297..658ae35 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -407,7 +407,9 @@ int platform_init(struct reef *reef) #endif
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; } diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 8bf2d7a..28643e0 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) }
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; } diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index f84d6e3..569c80a 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) dai_probe(ssp1);
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; }
On 2018年03月16日 09:31, Mike Mason wrote:
Hide dma_trace_init_complete if --disable-dma-trace was passed to configure. Otherwise, the compile with fail.
Liam is sending patch to remove this configure item which means we can't disable dma trace anymore once that applied.
Personally, I prefer we can preserve this configure option and your fix here is needed, but let's wait Liam's comment about that.
Thanks, ~Keyon
Signed-off-by: Mike Mason michael.w.mason@intel.com
src/platform/apollolake/platform.c | 2 ++ src/platform/baytrail/platform.c | 2 ++ src/platform/cannonlake/platform.c | 2 ++ src/platform/haswell/platform.c | 2 ++ 4 files changed, 8 insertions(+)
diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index 84f8e71..f601961 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -263,7 +263,9 @@ int platform_init(struct reef *reef) }
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; } diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index cec8297..658ae35 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -407,7 +407,9 @@ int platform_init(struct reef *reef) #endif
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; } diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 8bf2d7a..28643e0 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) }
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; } diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index f84d6e3..569c80a 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) dai_probe(ssp1);
/* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif
return 0; }
On Thu, 2018-03-15 at 18:31 -0700, Mike Mason wrote:
Hide dma_trace_init_complete if --disable-dma-trace was passed to configure. Otherwise, the compile with fail.
Signed-off-by: Mike Mason michael.w.mason@intel.com
src/platform/apollolake/platform.c | 2 ++ src/platform/baytrail/platform.c | 2 ++ src/platform/cannonlake/platform.c | 2 ++ src/platform/haswell/platform.c | 2 ++ 4 files changed, 8 insertions(+)
I've applied another solution that removes this configure switch.
Thanks
Liam
participants (3)
-
Keyon Jie
-
Liam Girdwood
-
Mike Mason