diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-10 18:56:43 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-10 18:56:43 +0300 |
| commit | 9b56741710c18fe97254d6b0d1ca0ebd7bc699c4 (patch) | |
| tree | 6ee59344f758963749a932559284693ab288ed51 | |
| parent | 42d9653e85b386111e729317b9492bfdac1cafbc (diff) | |
| parent | f1e3f409d61372b742697d0b5e5cd17d09de37db (diff) | |
| download | linux-9b56741710c18fe97254d6b0d1ca0ebd7bc699c4.tar.xz | |
Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
| -rw-r--r-- | include/sound/soc.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-pcm.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 538e9880e010..df819f76cbf6 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1247,7 +1247,6 @@ struct snd_soc_pcm_runtime { struct delayed_work delayed_work; #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dpcm_root; - struct dentry *debugfs_dpcm_state; #endif unsigned int num; /* 0-based and monotonic increasing */ diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index aa4c02de9c61..4b65aa91f64b 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -3010,8 +3010,7 @@ void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd) return; } - rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444, - rtd->debugfs_dpcm_root, - rtd, &dpcm_state_fops); + debugfs_create_file("state", 0444, rtd->debugfs_dpcm_root, + rtd, &dpcm_state_fops); } #endif |