Skip to content

Commit 3dc9137

Browse files
committed
ASoC: SOF: probe: Merge and clean up the probe and compress files
The probe debug functionality is implemented via compress support and it was spread across two set of files: probe.c/h compress.c/h Merge the two files into sof-probe.s/h and clean them up by removing unused struct definitions, functions. We can also move most of the functions static as they are only used internally. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent a11ecf8 commit 3dc9137

10 files changed

Lines changed: 220 additions & 364 deletions

File tree

sound/soc/sof/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\
44
control.o trace.o utils.o sof-audio.o
55
snd-sof-$(CONFIG_SND_SOC_SOF_CLIENT) += sof-client.o
66

7-
snd-sof-$(CONFIG_SND_SOC_SOF_DEBUG_PROBES) += probe.o compress.o
7+
snd-sof-$(CONFIG_SND_SOC_SOF_DEBUG_PROBES) += sof-probes.o
88

99
snd-sof-pci-objs := sof-pci-dev.o
1010
snd-sof-acpi-objs := sof-acpi-dev.o

sound/soc/sof/compress.c

Lines changed: 0 additions & 152 deletions
This file was deleted.

sound/soc/sof/compress.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

sound/soc/sof/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "sof-priv.h"
1717
#include "ops.h"
1818
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
19-
#include "probe.h"
19+
#include "sof-probes.h"
2020
#endif
2121

2222
/* see SOF_DBG_ flags */

sound/soc/sof/debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "ops.h"
2121

2222
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
23-
#include "probe.h"
23+
#include "sof-probes.h"
2424

2525
/**
2626
* strsplit_u32 - Split string into sequence of u32 tokens

sound/soc/sof/intel/hda-dai.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
1818

1919
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
20-
#include "../compress.h"
20+
#include "../sof-probes.h"
2121
#endif
2222

2323
struct hda_pipe_params {

sound/soc/sof/pcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "sof-audio.h"
1919
#include "ops.h"
2020
#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_PROBES)
21-
#include "compress.h"
21+
#include "sof-probes.h"
2222
#endif
2323

2424
static bool pcm_disable_pause = IS_ENABLED(CONFIG_SND_SOC_SOF_PCM_DISABLE_PAUSE);

sound/soc/sof/probe.h

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)