From 0493b53a478aa71678af2cf4f4087ddd889a403d Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Thu, 5 Oct 2017 13:35:04 +0530 Subject: [PATCH] ASoC: tegra-alt: remove kernel version check Version check is not required since 'struct component_driver' is available on both kernel-4.4 and kernel-4.9. These checks are earlier removed from t21x based module drivers. The same is done now for t18x specific drivers. Bug 200346429 Change-Id: Ie59600ed8fe4b6878ece58a055da522ce308300d Signed-off-by: Sameer Pujar Reviewed-on: https://git-master.nvidia.com/r/1573625 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker Reviewed-by: svc-mobile-coverity Reviewed-by: Mohan Kumar D GVS: Gerrit_Virtual_Submit Reviewed-by: Ravindra Lokhande --- sound/soc/tegra-alt/tegra186_arad_alt.c | 9 --------- sound/soc/tegra-alt/tegra186_asrc_alt.c | 9 --------- sound/soc/tegra-alt/tegra186_dspk_alt.c | 9 --------- 3 files changed, 27 deletions(-) diff --git a/sound/soc/tegra-alt/tegra186_arad_alt.c b/sound/soc/tegra-alt/tegra186_arad_alt.c index 9f918d80..fb6c0b44 100644 --- a/sound/soc/tegra-alt/tegra186_arad_alt.c +++ b/sound/soc/tegra-alt/tegra186_arad_alt.c @@ -578,14 +578,6 @@ EXPORT_SYMBOL(tegra186_arad_send_ratio); static struct snd_soc_codec_driver tegra186_arad_codec = { .probe = tegra186_arad_codec_probe, .idle_bias_off = 1, -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) - .dapm_widgets = tegra186_arad_widgets, - .num_dapm_widgets = ARRAY_SIZE(tegra186_arad_widgets), - .dapm_routes = tegra186_arad_routes, - .num_dapm_routes = ARRAY_SIZE(tegra186_arad_routes), - .controls = tegra186_arad_controls, - .num_controls = ARRAY_SIZE(tegra186_arad_controls), -#else .component_driver = { .dapm_widgets = tegra186_arad_widgets, .num_dapm_widgets = ARRAY_SIZE(tegra186_arad_widgets), @@ -594,7 +586,6 @@ static struct snd_soc_codec_driver tegra186_arad_codec = { .controls = tegra186_arad_controls, .num_controls = ARRAY_SIZE(tegra186_arad_controls), }, -#endif }; static bool tegra186_arad_wr_reg(struct device *dev, unsigned int reg) diff --git a/sound/soc/tegra-alt/tegra186_asrc_alt.c b/sound/soc/tegra-alt/tegra186_asrc_alt.c index 136f1cd0..e1d1ba66 100644 --- a/sound/soc/tegra-alt/tegra186_asrc_alt.c +++ b/sound/soc/tegra-alt/tegra186_asrc_alt.c @@ -913,14 +913,6 @@ static const struct snd_kcontrol_new tegra186_asrc_controls[] = { static struct snd_soc_codec_driver tegra186_asrc_codec = { .probe = tegra186_asrc_codec_probe, .idle_bias_off = 1, -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) - .dapm_widgets = tegra186_asrc_widgets, - .num_dapm_widgets = ARRAY_SIZE(tegra186_asrc_widgets), - .dapm_routes = tegra186_asrc_routes, - .num_dapm_routes = ARRAY_SIZE(tegra186_asrc_routes), - .controls = tegra186_asrc_controls, - .num_controls = ARRAY_SIZE(tegra186_asrc_controls), -#else .component_driver = { .dapm_widgets = tegra186_asrc_widgets, .num_dapm_widgets = ARRAY_SIZE(tegra186_asrc_widgets), @@ -929,7 +921,6 @@ static struct snd_soc_codec_driver tegra186_asrc_codec = { .controls = tegra186_asrc_controls, .num_controls = ARRAY_SIZE(tegra186_asrc_controls), }, -#endif }; static bool tegra186_asrc_wr_reg(struct device *dev, unsigned int reg) diff --git a/sound/soc/tegra-alt/tegra186_dspk_alt.c b/sound/soc/tegra-alt/tegra186_dspk_alt.c index c02a4651..4dca306b 100644 --- a/sound/soc/tegra-alt/tegra186_dspk_alt.c +++ b/sound/soc/tegra-alt/tegra186_dspk_alt.c @@ -347,14 +347,6 @@ static const struct snd_kcontrol_new tegrat186_dspk_controls[] = { static struct snd_soc_codec_driver tegra186_dspk_codec = { .probe = tegra186_dspk_codec_probe, .idle_bias_off = 1, -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) - .dapm_widgets = tegra186_dspk_widgets, - .num_dapm_widgets = ARRAY_SIZE(tegra186_dspk_widgets), - .dapm_routes = tegra186_dspk_routes, - .num_dapm_routes = ARRAY_SIZE(tegra186_dspk_routes), - .controls = tegrat186_dspk_controls, - .num_controls = ARRAY_SIZE(tegrat186_dspk_controls), -#else .component_driver = { .dapm_widgets = tegra186_dspk_widgets, .num_dapm_widgets = ARRAY_SIZE(tegra186_dspk_widgets), @@ -363,7 +355,6 @@ static struct snd_soc_codec_driver tegra186_dspk_codec = { .controls = tegrat186_dspk_controls, .num_controls = ARRAY_SIZE(tegrat186_dspk_controls), }, -#endif }; /* Regmap callback functions */