ASoC: sof: Fix warning when IPC flood test is not enabled

Message ID 20190808221850.25963-1-broonie@kernel.org
State Accepted
Commit f6326fa4855b0f8173af822fcc139afdbf4d4b71
Headers show
Series
  • ASoC: sof: Fix warning when IPC flood test is not enabled
Related show

Commit Message

Mark Brown Aug. 8, 2019, 10:18 p.m.
dentry is only used when the flood test is done so move the declaration
of the variable inside the ifdef for the flood test.

Signed-off-by: Mark Brown <broonie@kernel.org>

---
 sound/soc/sof/debug.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Comments

Sridharan, Ranjani Aug. 8, 2019, 10:35 p.m. | #1
On Thu, Aug 8, 2019 at 3:21 PM Mark Brown <broonie@kernel.org> wrote:

> dentry is only used when the flood test is done so move the declaration

> of the variable inside the ifdef for the flood test.

>

> Signed-off-by: Mark Brown <broonie@kernel.org>

>

Looks good, thanks, Mark.
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>


> ---

>  sound/soc/sof/debug.c | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

>

> diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c

> index 40940b2fe9d5..54cd431faab7 100644

> --- a/sound/soc/sof/debug.c

> +++ b/sound/soc/sof/debug.c

> @@ -221,7 +221,6 @@ static ssize_t sof_dfsentry_read(struct file *file,

> char __user *buffer,

>  {

>         struct snd_sof_dfsentry *dfse = file->private_data;

>         struct snd_sof_dev *sdev = dfse->sdev;

> -       struct dentry *dentry;

>         loff_t pos = *ppos;

>         size_t size_ret;

>         int skip = 0;

> @@ -229,6 +228,8 @@ static ssize_t sof_dfsentry_read(struct file *file,

> char __user *buffer,

>         u8 *buf;

>

>  #if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST)

> +       struct dentry *dentry;

> +

>         dentry = file->f_path.dentry;

>         if ((!strcmp(dentry->d_name.name, "ipc_flood_count") ||

>              !strcmp(dentry->d_name.name, "ipc_flood_duration_ms")) &&

> --

> 2.20.1

>

> _______________________________________________

> Alsa-devel mailing list

> Alsa-devel@alsa-project.org

> https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

>

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Patch

diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
index 40940b2fe9d5..54cd431faab7 100644
--- a/sound/soc/sof/debug.c
+++ b/sound/soc/sof/debug.c
@@ -221,7 +221,6 @@  static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
 {
 	struct snd_sof_dfsentry *dfse = file->private_data;
 	struct snd_sof_dev *sdev = dfse->sdev;
-	struct dentry *dentry;
 	loff_t pos = *ppos;
 	size_t size_ret;
 	int skip = 0;
@@ -229,6 +228,8 @@  static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
 	u8 *buf;
 
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST)
+	struct dentry *dentry;
+
 	dentry = file->f_path.dentry;
 	if ((!strcmp(dentry->d_name.name, "ipc_flood_count") ||
 	     !strcmp(dentry->d_name.name, "ipc_flood_duration_ms")) &&