diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c index b53f5bb1..7260b232 100644 --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -40,16 +40,6 @@ chip ## _ADMAIF_TX_BASE, \ chip ## _ADMAIF_RX_BASE) -static unsigned int tegra_supported_admaif_rate[] = { - 8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000, - 64000, 88200, 96000, 176400, 192000, -}; - -static struct snd_pcm_hw_constraint_list tegra_admaif_rate_constraints = { - .count = ARRAY_SIZE(tegra_supported_admaif_rate), - .list = tegra_supported_admaif_rate, -}; - static const struct reg_default tegra186_admaif_reg_defaults[] = { {(TEGRA_ADMAIF_GLOBAL_CG_0 + TEGRA186_ADMAIF_GLOBAL_BASE), 0x00000003}, ADMAIF_REG_DEFAULTS(1, TEGRA186), @@ -455,16 +445,8 @@ static int tegra_admaif_trigger(struct snd_pcm_substream *substream, int cmd, } } -static int tegra_admaif_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - return snd_pcm_hw_constraint_list(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, &tegra_admaif_rate_constraints); -} - static const struct snd_soc_dai_ops tegra_admaif_dai_ops = { .hw_params = tegra_admaif_hw_params, - .startup = tegra_admaif_startup, .trigger = tegra_admaif_trigger, .shutdown = tegra_admaif_shutdown, .prepare = tegra_admaif_prepare, diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c index 27e98f4d..5aad1d31 100644 --- a/sound/soc/tegra/tegra210_ahub.c +++ b/sound/soc/tegra/tegra210_ahub.c @@ -14,16 +14,6 @@ #include #include "tegra210_ahub.h" -static unsigned int tegra_supported_ahub_rate[] = { - 8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000, - 64000, 88200, 96000, 176400, 192000, -}; - -static struct snd_pcm_hw_constraint_list tegra_ahub_rate_constraints = { - .count = ARRAY_SIZE(tegra_supported_ahub_rate), - .list = tegra_supported_ahub_rate, -}; - static int tegra_ahub_get_value_enum(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *uctl) { @@ -146,17 +136,6 @@ void tegra210_ahub_read_ram(struct regmap *regmap, unsigned int reg_ctrl, } EXPORT_SYMBOL_GPL(tegra210_ahub_read_ram); -static int tegra_ahub_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - return snd_pcm_hw_constraint_list(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, &tegra_ahub_rate_constraints); -} - -static struct snd_soc_dai_ops tegra_ahub_dai_ops = { - .startup = tegra_ahub_startup, -}; - static struct snd_soc_dai_driver tegra210_ahub_dais[] = { DAI(ADMAIF1), DAI(ADMAIF2), diff --git a/sound/soc/tegra/tegra210_ahub.h b/sound/soc/tegra/tegra210_ahub.h index 8a4b8a66..fae7f0ae 100644 --- a/sound/soc/tegra/tegra210_ahub.h +++ b/sound/soc/tegra/tegra210_ahub.h @@ -118,7 +118,6 @@ SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S32_LE, \ }, \ - .ops = &tegra_ahub_dai_ops, \ } struct tegra_ahub_soc_data {