ASoC: SOF: remove nocodec_fw_filename

Remove nocodec_fw_filename from struct sof_dev_desc
as it is not longer needed.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191204211556.12671-12-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sof.h b/include/sound/sof.h
index 1723478..98a757d 100644 (file)
--- a/include/sound/sof.h
+++ b/include/sound/sof.h
@@ -84,7 +84,6 @@ struct sof_dev_desc {
        const void *chip_info;
 
        /* defaults for no codec mode */
-       const char *nocodec_fw_filename;
        const char *nocodec_tplg_filename;
 
        /* defaults paths for firmware and topology files */

diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c
index 8174b9a..9c0a4ee 100644 (file)
--- a/sound/soc/sof/sof-acpi-dev.c
+++ b/sound/soc/sof/sof-acpi-dev.c
@@ -46,7 +46,6 @@ static const struct sof_dev_desc sof_acpi_haswell_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-hsw.ri",
-       .nocodec_fw_filename = "sof-hsw.ri",
        .nocodec_tplg_filename = "sof-hsw-nocodec.tplg",
        .ops = &sof_hsw_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -64,7 +63,6 @@ static const struct sof_dev_desc sof_acpi_broadwell_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-bdw.ri",
-       .nocodec_fw_filename = "sof-bdw.ri",
        .nocodec_tplg_filename = "sof-bdw-nocodec.tplg",
        .ops = &sof_bdw_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -84,7 +82,6 @@ static const struct sof_dev_desc sof_acpi_baytrailcr_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-byt.ri",
-       .nocodec_fw_filename = "sof-byt.ri",
        .nocodec_tplg_filename = "sof-byt-nocodec.tplg",
        .ops = &sof_byt_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -100,7 +97,6 @@ static const struct sof_dev_desc sof_acpi_baytrail_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-byt.ri",
-       .nocodec_fw_filename = "sof-byt.ri",
        .nocodec_tplg_filename = "sof-byt-nocodec.tplg",
        .ops = &sof_byt_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -116,7 +112,6 @@ static const struct sof_dev_desc sof_acpi_cherrytrail_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-cht.ri",
-       .nocodec_fw_filename = "sof-cht.ri",
        .nocodec_tplg_filename = "sof-cht-nocodec.tplg",
        .ops = &sof_cht_ops,
        .arch_ops = &sof_xtensa_arch_ops

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c
index 170a583..39ea8af 100644 (file)
--- a/sound/soc/sof/sof-of-dev.c
+++ b/sound/soc/sof/sof-of-dev.c
@@ -20,7 +20,6 @@ static struct sof_dev_desc sof_of_imx8qxp_desc = {
        .default_fw_path = "imx/sof",
        .default_tplg_path = "imx/sof-tplg",
        .default_fw_filename = "sof-imx8.ri",
-       .nocodec_fw_filename = "sof-imx8.ri",
        .nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
        .ops = &sof_imx8_ops,
 };

diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 1c7b873..5f08a9c 100644 (file)
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -48,7 +48,6 @@ static const struct sof_dev_desc bxt_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-apl.ri",
-       .nocodec_fw_filename = "sof-apl.ri",
        .nocodec_tplg_filename = "sof-apl-nocodec.tplg",
        .ops = &sof_apl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -67,7 +66,6 @@ static const struct sof_dev_desc glk_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-glk.ri",
-       .nocodec_fw_filename = "sof-glk.ri",
        .nocodec_tplg_filename = "sof-glk-nocodec.tplg",
        .ops = &sof_apl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -96,7 +94,6 @@ static const struct sof_dev_desc tng_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-byt.ri",
-       .nocodec_fw_filename = "sof-byt.ri",
        .nocodec_tplg_filename = "sof-byt.tplg",
        .ops = &sof_tng_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -115,7 +112,6 @@ static const struct sof_dev_desc cnl_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-cnl.ri",
-       .nocodec_fw_filename = "sof-cnl.ri",
        .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
        .ops = &sof_cnl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -134,7 +130,6 @@ static const struct sof_dev_desc cfl_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-cfl.ri",
-       .nocodec_fw_filename = "sof-cfl.ri",
        .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
        .ops = &sof_cnl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -155,7 +150,6 @@ static const struct sof_dev_desc cml_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-cml.ri",
-       .nocodec_fw_filename = "sof-cml.ri",
        .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
        .ops = &sof_cnl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -174,7 +168,6 @@ static const struct sof_dev_desc icl_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-icl.ri",
-       .nocodec_fw_filename = "sof-icl.ri",
        .nocodec_tplg_filename = "sof-icl-nocodec.tplg",
        .ops = &sof_cnl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -193,7 +186,6 @@ static const struct sof_dev_desc tgl_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-tgl.ri",
-       .nocodec_fw_filename = "sof-tgl.ri",
        .nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
        .ops = &sof_cnl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -212,7 +204,6 @@ static const struct sof_dev_desc ehl_desc = {
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
        .default_fw_filename = "sof-ehl.ri",
-       .nocodec_fw_filename = "sof-ehl.ri",
        .nocodec_tplg_filename = "sof-ehl-nocodec.tplg",
        .ops = &sof_cnl_ops,
        .arch_ops = &sof_xtensa_arch_ops
@@ -230,7 +221,6 @@ static const struct sof_dev_desc jsl_desc = {
        .chip_info = &jsl_chip_info,
        .default_fw_path = "intel/sof",
        .default_tplg_path = "intel/sof-tplg",
-       .nocodec_fw_filename = "sof-jsl.ri",
        .nocodec_tplg_filename = "sof-jsl-nocodec.tplg",
        .ops = &sof_cnl_ops,
        .arch_ops = &sof_xtensa_arch_ops