ASoC: Intel: hsw_rt5640: Reword prefixes of all driver members

Replace ambiguous 'haswell_rt5640_' prefixes in favour of 'card_',
'link_' and other similar strings to clearly state which object given
member implements behavior for.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220620101402.2684366-3-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/hsw_rt5640.c b/sound/soc/intel/boards/hsw_rt5640.c
index aa61e10..b51ce8d 100644 (file)
--- a/sound/soc/intel/boards/hsw_rt5640.c
+++ b/sound/soc/intel/boards/hsw_rt5640.c
@@ -16,12 +16,12 @@
 #include "../../codecs/rt5640.h"
 
 /* Haswell ULT platforms have a Headphone and Mic jack */
-static const struct snd_soc_dapm_widget haswell_widgets[] = {
+static const struct snd_soc_dapm_widget card_widgets[] = {
        SND_SOC_DAPM_HP("Headphones", NULL),
        SND_SOC_DAPM_MIC("Mic", NULL),
 };
 
-static const struct snd_soc_dapm_route haswell_rt5640_map[] = {
+static const struct snd_soc_dapm_route card_routes[] = {
 
        {"Headphones", NULL, "HPOR"},
        {"Headphones", NULL, "HPOL"},
@@ -32,7 +32,7 @@ static const struct snd_soc_dapm_route haswell_rt5640_map[] = {
        {"AIF1 Playback", NULL, "SSP0 CODEC OUT"},
 };
 
-static int haswell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd,
+static int codec_link_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                        struct snd_pcm_hw_params *params)
 {
        struct snd_interval *rate = hw_param_interval(params,
@@ -49,7 +49,7 @@ static int haswell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd,
        return 0;
 }
 
-static int haswell_rt5640_hw_params(struct snd_pcm_substream *substream,
+static int codec_link_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
@@ -70,8 +70,8 @@ static int haswell_rt5640_hw_params(struct snd_pcm_substream *substream,
        return ret;
 }
 
-static const struct snd_soc_ops haswell_rt5640_ops = {
-       .hw_params = haswell_rt5640_hw_params,
+static const struct snd_soc_ops codec_link_ops = {
+       .hw_params = codec_link_hw_params,
 };
 
 SND_SOC_DAILINK_DEF(dummy,
@@ -98,7 +98,7 @@ SND_SOC_DAILINK_DEF(platform,
 SND_SOC_DAILINK_DEF(ssp0_port,
            DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
 
-static struct snd_soc_dai_link haswell_rt5640_dais[] = {
+static struct snd_soc_dai_link card_dai_links[] = {
        /* Front End DAI links */
        {
                .name = "System",
@@ -147,8 +147,8 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBC_CFC,
                .ignore_pmdown_time = 1,
-               .be_hw_params_fixup = haswell_ssp0_fixup,
-               .ops = &haswell_rt5640_ops,
+               .be_hw_params_fixup = codec_link_hw_params_fixup,
+               .ops = &codec_link_ops,
                .dpcm_playback = 1,
                .dpcm_capture = 1,
                SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
@@ -156,44 +156,44 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
 };
 
 /* audio machine driver for Haswell Lynxpoint DSP + RT5640 */
-static struct snd_soc_card haswell_rt5640 = {
+static struct snd_soc_card hsw_rt5640_card = {
        .name = "haswell-rt5640",
        .owner = THIS_MODULE,
-       .dai_link = haswell_rt5640_dais,
-       .num_links = ARRAY_SIZE(haswell_rt5640_dais),
-       .dapm_widgets = haswell_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(haswell_widgets),
-       .dapm_routes = haswell_rt5640_map,
-       .num_dapm_routes = ARRAY_SIZE(haswell_rt5640_map),
+       .dai_link = card_dai_links,
+       .num_links = ARRAY_SIZE(card_dai_links),
+       .dapm_widgets = card_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(card_widgets),
+       .dapm_routes = card_routes,
+       .num_dapm_routes = ARRAY_SIZE(card_routes),
        .fully_routed = true,
 };
 
-static int haswell_audio_probe(struct platform_device *pdev)
+static int hsw_rt5640_probe(struct platform_device *pdev)
 {
        struct snd_soc_acpi_mach *mach;
        int ret;
 
-       haswell_rt5640.dev = &pdev->dev;
+       hsw_rt5640_card.dev = &pdev->dev;
 
        /* override platform name, if required */
        mach = pdev->dev.platform_data;
-       ret = snd_soc_fixup_dai_links_platform_name(&haswell_rt5640,
+       ret = snd_soc_fixup_dai_links_platform_name(&hsw_rt5640_card,
                                                    mach->mach_params.platform);
        if (ret)
                return ret;
 
-       return devm_snd_soc_register_card(&pdev->dev, &haswell_rt5640);
+       return devm_snd_soc_register_card(&pdev->dev, &hsw_rt5640_card);
 }
 
-static struct platform_driver haswell_audio = {
-       .probe = haswell_audio_probe,
+static struct platform_driver hsw_rt5640_driver = {
+       .probe = hsw_rt5640_probe,
        .driver = {
                .name = "haswell-audio",
                .pm = &snd_soc_pm_ops,
        },
 };
 
-module_platform_driver(haswell_audio)
+module_platform_driver(hsw_rt5640_driver)
 
 /* Module information */
 MODULE_AUTHOR("Liam Girdwood, Xingchao Wang");