ASoC: amd: vangogh: Small code refactor

Small refactor of the code:
 - sort includes in alphabetical order
 - sort variables declarations by line length
 - remove unnecessary "struct snd_soc_card *card" lines
 - insert blank lines before return
 - break/unbreak some lines for better read
 - align defines

Signed-off-by: Lucas Tanure <lucas.tanure@collabora.com>
Link: https://lore.kernel.org/r/20230217110850.1045250-3-lucas.tanure@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c
index 5bd9418..f914f63 100644 (file)
--- a/sound/soc/amd/vangogh/acp5x-mach.c
+++ b/sound/soc/amd/vangogh/acp5x-mach.c
@@ -5,34 +5,31 @@
  *
  * Copyright 2021 Advanced Micro Devices, Inc.
  */
-
-#include <sound/soc.h>
-#include <sound/soc-dapm.h>
-#include <linux/module.h>
-#include <linux/io.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-
-#include <sound/jack.h>
+#include <linux/acpi.h>
 #include <linux/clk.h>
+#include <linux/dmi.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
+#include <linux/io.h>
 #include <linux/i2c.h>
 #include <linux/input.h>
-#include <linux/acpi.h>
-#include <linux/dmi.h>
+#include <linux/module.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
 
 #include "../../codecs/nau8821.h"
 #include "../../codecs/cs35l41.h"
-
 #include "acp5x.h"
 
-#define DRV_NAME "acp5x_mach"
-#define DUAL_CHANNEL           2
-#define ACP5X_NUVOTON_CODEC_DAI        "nau8821-hifi"
-#define VG_JUPITER 1
-#define ACP5X_NUVOTON_BCLK 3072000
-#define ACP5X_NAU8821_FREQ_OUT 12288000
+#define DRV_NAME                       "acp5x_mach"
+#define DUAL_CHANNEL                   2
+#define ACP5X_NUVOTON_CODEC_DAI                "nau8821-hifi"
+#define VG_JUPITER                     1
+#define ACP5X_NUVOTON_BCLK             3072000
+#define ACP5X_NAU8821_FREQ_OUT         12288000
 
 static unsigned long acp5x_machine_id;
 static struct snd_soc_jack vg_headset;
@@ -50,16 +47,14 @@ static struct snd_soc_jack_pin acp5x_nau8821_jack_pins[] = {
 
 static int acp5x_8821_init(struct snd_soc_pcm_runtime *rtd)
 {
+       struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
        int ret;
-       struct snd_soc_card *card = rtd->card;
-       struct snd_soc_component *component =
-                                       asoc_rtd_to_codec(rtd, 0)->component;
 
        /*
         * Headset buttons map to the google Reference headset.
         * These can be configured by userspace.
         */
-       ret = snd_soc_card_jack_new_pins(card, "Headset Jack",
+       ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",
                                         SND_JACK_HEADSET | SND_JACK_BTN_0,
                                         &vg_headset, acp5x_nau8821_jack_pins,
                                         ARRAY_SIZE(acp5x_nau8821_jack_pins));
@@ -70,6 +65,7 @@ static int acp5x_8821_init(struct snd_soc_pcm_runtime *rtd)
 
        snd_jack_set_key(vg_headset.jack, SND_JACK_BTN_0, KEY_MEDIA);
        nau8821_enable_jack_detect(component, &vg_headset);
+
        return ret;
 }
 
@@ -104,8 +100,7 @@ static int acp5x_8821_startup(struct snd_pcm_substream *substream)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_card *card = rtd->card;
-       struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(card);
+       struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card);
 
        machine->play_i2s_instance = I2S_SP_INSTANCE;
        machine->cap_i2s_instance = I2S_SP_INSTANCE;
@@ -118,6 +113,7 @@ static int acp5x_8821_startup(struct snd_pcm_substream *substream)
        snd_pcm_hw_constraint_list(substream->runtime, 0,
                                   SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
                                   &constraints_sample_bits);
+
        return 0;
 }
 
@@ -126,16 +122,13 @@ static int acp5x_nau8821_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
        struct snd_soc_card *card = rtd->card;
-       struct snd_soc_dai *codec_dai =
-                       snd_soc_card_get_codec_dai(card,
-                                                  ACP5X_NUVOTON_CODEC_DAI);
+       struct snd_soc_dai *dai = snd_soc_card_get_codec_dai(card, ACP5X_NUVOTON_CODEC_DAI);
        int ret;
 
-       ret = snd_soc_dai_set_sysclk(codec_dai, NAU8821_CLK_FLL_BLK, 0,
-                                    SND_SOC_CLOCK_IN);
+       ret = snd_soc_dai_set_sysclk(dai, NAU8821_CLK_FLL_BLK, 0, SND_SOC_CLOCK_IN);
        if (ret < 0)
                dev_err(card->dev, "can't set FS clock %d\n", ret);
-       ret = snd_soc_dai_set_pll(codec_dai, 0, 0, snd_soc_params_to_bclk(params),
+       ret = snd_soc_dai_set_pll(dai, 0, 0, snd_soc_params_to_bclk(params),
                                  params_rate(params) * 256);
        if (ret < 0)
                dev_err(card->dev, "can't set FLL: %d\n", ret);
@@ -145,10 +138,9 @@ static int acp5x_nau8821_hw_params(struct snd_pcm_substream *substream,
 
 static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream)
 {
-       struct snd_pcm_runtime *runtime = substream->runtime;
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_card *card = rtd->card;
-       struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(card);
+       struct acp5x_platform_info *machine = snd_soc_card_get_drvdata(rtd->card);
+       struct snd_pcm_runtime *runtime = substream->runtime;
 
        machine->play_i2s_instance = I2S_HS_INSTANCE;
 
@@ -157,6 +149,7 @@ static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream)
                                   &constraints_channels);
        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                   &constraints_rates);
+
        return 0;
 }
 
@@ -164,16 +157,16 @@ static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream,
                                   struct snd_pcm_hw_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_card *card = rtd->card;
-       struct snd_soc_dai *codec_dai;
-       int ret, i;
        unsigned int num_codecs = rtd->dai_link->num_codecs;
+       struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dai *dai;
        unsigned int bclk_val;
+       int ret, i;
 
        ret = 0;
        for (i = 0; i < num_codecs; i++) {
-               codec_dai = asoc_rtd_to_codec(rtd, i);
-               if (strcmp(codec_dai->name, "cs35l41-pcm") == 0) {
+               dai = asoc_rtd_to_codec(rtd, i);
+               if (strcmp(dai->name, "cs35l41-pcm") == 0) {
                        switch (params_rate(params)) {
                        case 48000:
                                bclk_val = 1536000;
@@ -183,8 +176,8 @@ static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream,
                                        params_rate(params));
                                return -EINVAL;
                        }
-                       ret = snd_soc_component_set_sysclk(codec_dai->component,
-                                                          0, 0, bclk_val, SND_SOC_CLOCK_IN);
+                       ret = snd_soc_component_set_sysclk(dai->component, 0, 0,
+                                                          bclk_val, SND_SOC_CLOCK_IN);
                        if (ret < 0) {
                                dev_err(card->dev, "failed to set sysclk for CS35l41 dai\n");
                                return ret;
@@ -216,28 +209,19 @@ static struct snd_soc_codec_conf cs35l41_conf[] = {
        },
 };
 
-SND_SOC_DAILINK_DEF(acp5x_i2s,
-                   DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.0")));
-
-SND_SOC_DAILINK_DEF(acp5x_bt,
-                   DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.1")));
-
-SND_SOC_DAILINK_DEF(nau8821,
-                   DAILINK_COMP_ARRAY(COMP_CODEC("i2c-NVTN2020:00",
-                                                 "nau8821-hifi")));
-
-SND_SOC_DAILINK_DEF(cs35l41,
-                   DAILINK_COMP_ARRAY(COMP_CODEC("spi-VLV1776:00", "cs35l41-pcm"),
-                                      COMP_CODEC("spi-VLV1776:01", "cs35l41-pcm")));
-
-SND_SOC_DAILINK_DEF(platform,
-                   DAILINK_COMP_ARRAY(COMP_PLATFORM("acp5x_i2s_dma.0")));
+SND_SOC_DAILINK_DEF(platform,  DAILINK_COMP_ARRAY(COMP_PLATFORM("acp5x_i2s_dma.0")));
+SND_SOC_DAILINK_DEF(acp5x_i2s, DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.0")));
+SND_SOC_DAILINK_DEF(acp5x_bt,  DAILINK_COMP_ARRAY(COMP_CPU("acp5x_i2s_playcap.1")));
+SND_SOC_DAILINK_DEF(nau8821,   DAILINK_COMP_ARRAY(COMP_CODEC("i2c-NVTN2020:00", "nau8821-hifi")));
+SND_SOC_DAILINK_DEF(cs35l41,   DAILINK_COMP_ARRAY(COMP_CODEC("spi-VLV1776:00", "cs35l41-pcm"),
+                                                 COMP_CODEC("spi-VLV1776:01", "cs35l41-pcm")));
 
 static struct snd_soc_dai_link acp5x_dai[] = {
        {
                .name = "acp5x-8821-play",
                .stream_name = "Playback/Capture",
-               .dai_fmt = SND_SOC_DAIFMT_I2S  | SND_SOC_DAIFMT_NB_NF |
+               .dai_fmt = SND_SOC_DAIFMT_I2S |
+                          SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBC_CFC,
                .dpcm_playback = 1,
                .dpcm_capture = 1,
@@ -248,7 +232,8 @@ static struct snd_soc_dai_link acp5x_dai[] = {
        {
                .name = "acp5x-CS35L41-Stereo",
                .stream_name = "CS35L41 Stereo Playback",
-               .dai_fmt = SND_SOC_DAIFMT_I2S  | SND_SOC_DAIFMT_NB_NF |
+               .dai_fmt = SND_SOC_DAIFMT_I2S |
+                          SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBC_CFC,
                .dpcm_playback = 1,
                .playback_only = 1,
@@ -258,36 +243,34 @@ static struct snd_soc_dai_link acp5x_dai[] = {
 };
 
 static int platform_clock_control(struct snd_soc_dapm_widget *w,
-                                 struct snd_kcontrol *k, int  event)
+                                 struct snd_kcontrol *k, int event)
 {
        struct snd_soc_dapm_context *dapm = w->dapm;
        struct snd_soc_card *card = dapm->card;
-       struct snd_soc_dai *codec_dai;
+       struct snd_soc_dai *dai;
        int ret = 0;
 
-       codec_dai = snd_soc_card_get_codec_dai(card, ACP5X_NUVOTON_CODEC_DAI);
-       if (!codec_dai) {
+       dai = snd_soc_card_get_codec_dai(card, ACP5X_NUVOTON_CODEC_DAI);
+       if (!dai) {
                dev_err(card->dev, "Codec dai not found\n");
                return -EIO;
        }
 
        if (SND_SOC_DAPM_EVENT_OFF(event)) {
-               ret = snd_soc_dai_set_sysclk(codec_dai, NAU8821_CLK_INTERNAL,
-                                            0, SND_SOC_CLOCK_IN);
+               ret = snd_soc_dai_set_sysclk(dai, NAU8821_CLK_INTERNAL, 0, SND_SOC_CLOCK_IN);
                if (ret < 0) {
                        dev_err(card->dev, "set sysclk err = %d\n", ret);
                        return -EIO;
                }
        } else {
-               ret = snd_soc_dai_set_sysclk(codec_dai, NAU8821_CLK_FLL_BLK, 0,
-                                            SND_SOC_CLOCK_IN);
+               ret = snd_soc_dai_set_sysclk(dai, NAU8821_CLK_FLL_BLK, 0, SND_SOC_CLOCK_IN);
                if (ret < 0)
-                       dev_err(codec_dai->dev, "can't set BLK clock %d\n", ret);
-               ret = snd_soc_dai_set_pll(codec_dai, 0, 0, ACP5X_NUVOTON_BCLK,
-                                         ACP5X_NAU8821_FREQ_OUT);
+                       dev_err(dai->dev, "can't set BLK clock %d\n", ret);
+               ret = snd_soc_dai_set_pll(dai, 0, 0, ACP5X_NUVOTON_BCLK, ACP5X_NAU8821_FREQ_OUT);
                if (ret < 0)
-                       dev_err(codec_dai->dev, "can't set FLL: %d\n", ret);
+                       dev_err(dai->dev, "can't set FLL: %d\n", ret);
        }
+
        return ret;
 }
 
@@ -302,7 +285,8 @@ static const struct snd_soc_dapm_widget acp5x_8821_widgets[] = {
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
        SND_SOC_DAPM_MIC("Int Mic", NULL),
        SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
-                           platform_clock_control, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+                           platform_clock_control,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 };
 
 static const struct snd_soc_dapm_route acp5x_8821_audio_route[] = {
@@ -336,6 +320,7 @@ static struct snd_soc_card acp5x_card = {
 static int acp5x_vg_quirk_cb(const struct dmi_system_id *id)
 {
        acp5x_machine_id = VG_JUPITER;
+
        return 1;
 }
 
@@ -352,12 +337,12 @@ static const struct dmi_system_id acp5x_vg_quirk_table[] = {
 
 static int acp5x_probe(struct platform_device *pdev)
 {
-       int ret;
        struct acp5x_platform_info *machine;
+       struct device *dev = &pdev->dev;
        struct snd_soc_card *card;
+       int ret;
 
-       machine = devm_kzalloc(&pdev->dev, sizeof(struct acp5x_platform_info),
-                              GFP_KERNEL);
+       machine = devm_kzalloc(dev, sizeof(struct acp5x_platform_info), GFP_KERNEL);
        if (!machine)
                return -ENOMEM;
 
@@ -365,20 +350,18 @@ static int acp5x_probe(struct platform_device *pdev)
        switch (acp5x_machine_id) {
        case VG_JUPITER:
                card = &acp5x_card;
-               acp5x_card.dev = &pdev->dev;
                break;
        default:
                return -ENODEV;
        }
+       card->dev = dev;
        platform_set_drvdata(pdev, card);
        snd_soc_card_set_drvdata(card, machine);
 
-       ret = devm_snd_soc_register_card(&pdev->dev, card);
-       if (ret) {
-               return dev_err_probe(&pdev->dev, ret,
-                                    "snd_soc_register_card(%s) failed\n",
-                                    acp5x_card.name);
-       }
+       ret = devm_snd_soc_register_card(dev, card);
+       if (ret)
+               return dev_err_probe(dev, ret, "Register card (%s) failed\n", card->name);
+
        return 0;
 }