ASoC: fsl_sai: Drop unnecessary defines

The fsl_sai driver has FSL_FMT_TRANSMITTER and FSL_FMT_RECEIVER defines
which are used in a single function only then are then only translated
into a bool 'tx' variable. Drop the defines and pass the boolean value
directly to fsl_sai_set_dai_sysclk_tr(). No functional change.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.kernel.org/r/20220302083428.3804687-2-s.hauer@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index c2d423d1d87eded7c101496fc1ef924bd27e7182..9b43f94f672f16eeddc188ba00a37643554b462d 100644 (file)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -167,11 +167,10 @@ static int fsl_sai_set_dai_bclk_ratio(struct snd_soc_dai *dai,
 }
 
 static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai,
-               int clk_id, unsigned int freq, int fsl_dir)
+               int clk_id, unsigned int freq, bool tx)
 {
        struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
        unsigned int ofs = sai->soc_data->reg_offset;
-       bool tx = fsl_dir == FSL_FMT_TRANSMITTER;
        u32 val_cr2 = 0;
 
        switch (clk_id) {
@@ -205,15 +204,13 @@ static int fsl_sai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
        if (dir == SND_SOC_CLOCK_IN)
                return 0;
 
-       ret = fsl_sai_set_dai_sysclk_tr(cpu_dai, clk_id, freq,
-                                       FSL_FMT_TRANSMITTER);
+       ret = fsl_sai_set_dai_sysclk_tr(cpu_dai, clk_id, freq, true);
        if (ret) {
                dev_err(cpu_dai->dev, "Cannot set tx sysclk: %d\n", ret);
                return ret;
        }
 
-       ret = fsl_sai_set_dai_sysclk_tr(cpu_dai, clk_id, freq,
-                                       FSL_FMT_RECEIVER);
+       ret = fsl_sai_set_dai_sysclk_tr(cpu_dai, clk_id, freq, false);
        if (ret)
                dev_err(cpu_dai->dev, "Cannot set rx sysclk: %d\n", ret);
 
@@ -221,11 +218,10 @@ static int fsl_sai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
 }
 
 static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
-                               unsigned int fmt, int fsl_dir)
+                               unsigned int fmt, bool tx)
 {
        struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
        unsigned int ofs = sai->soc_data->reg_offset;
-       bool tx = fsl_dir == FSL_FMT_TRANSMITTER;
        u32 val_cr2 = 0, val_cr4 = 0;
 
        if (!sai->is_lsb_first)
@@ -332,13 +328,13 @@ static int fsl_sai_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 {
        int ret;
 
-       ret = fsl_sai_set_dai_fmt_tr(cpu_dai, fmt, FSL_FMT_TRANSMITTER);
+       ret = fsl_sai_set_dai_fmt_tr(cpu_dai, fmt, true);
        if (ret) {
                dev_err(cpu_dai->dev, "Cannot set tx format: %d\n", ret);
                return ret;
        }
 
-       ret = fsl_sai_set_dai_fmt_tr(cpu_dai, fmt, FSL_FMT_RECEIVER);
+       ret = fsl_sai_set_dai_fmt_tr(cpu_dai, fmt, false);
        if (ret)
                dev_err(cpu_dai->dev, "Cannot set rx format: %d\n", ret);
 

diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index 410f6e6a9137d02b59ffc36a9290b9b77a96557f..b30d6113ff08873c59af76c88ae903c0cc1364dc 100644 (file)
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -201,9 +201,6 @@
 #define FSL_SAI_REC_SYN                BIT(4)
 #define FSL_SAI_USE_I2S_SLAVE  BIT(5)
 
-#define FSL_FMT_TRANSMITTER    0
-#define FSL_FMT_RECEIVER       1
-
 /* SAI clock sources */
 #define FSL_SAI_CLK_BUS                0
 #define FSL_SAI_CLK_MAST1      1