[PATCH 10/11] drm/vc4: hdmi: Remove redundant variables

[Maxime Ripard]

Signed-off-by: Maxime Ripard <max...@cerno.tech>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 26 ++++++++++++--------------
 drivers/gpu/drm/vc4/vc4_hdmi.h |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 19739b57d067..a5780da70c1c 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1008,12 +1008,13 @@ static u32 vc5_hdmi_channel_map(struct vc4_hdmi 
*vc4_hdmi, u32 channel_mask)
 }
 
 /* HDMI audio codec callbacks */
-static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi)
+static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi,
+                                        unsigned int samplerate)
 {
        u32 hsm_clock = clk_get_rate(vc4_hdmi->audio_clock);
        unsigned long n, m;
 
-       rational_best_approximation(hsm_clock, vc4_hdmi->audio.samplerate,
+       rational_best_approximation(hsm_clock, samplerate,
                                    VC4_HD_MAI_SMP_N_MASK >>
                                    VC4_HD_MAI_SMP_N_SHIFT,
                                    (VC4_HD_MAI_SMP_M_MASK >>
@@ -1025,12 +1026,11 @@ static void vc4_hdmi_audio_set_mai_clock(struct 
vc4_hdmi *vc4_hdmi)
                   VC4_SET_FIELD(m - 1, VC4_HD_MAI_SMP_M));
 }
 
-static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi)
+static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi, unsigned int 
samplerate)
 {
        struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
        struct drm_crtc *crtc = encoder->crtc;
        const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
-       u32 samplerate = vc4_hdmi->audio.samplerate;
        u32 n, cts;
        u64 tmp;
 
@@ -1164,27 +1164,25 @@ static int vc4_hdmi_audio_prepare(struct device *dev, 
void *data,
 {
        struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
        struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
+       unsigned int sample_rate = params->sample_rate;
+       unsigned int channels = params->channels;
        u32 audio_packet_config, channel_mask;
        u32 channel_map;
        u32 mai_audio_format;
        u32 mai_sample_rate;
 
        dev_dbg(dev, "%s: %u Hz, %d bit, %d channels\n", __func__,
-               params->sample_rate, params->sample_width,
-               params->channels);
-
-       vc4_hdmi->audio.channels = params->channels;
-       vc4_hdmi->audio.samplerate = params->sample_rate;
+               sample_rate, params->sample_width, channels);
 
        HDMI_WRITE(HDMI_MAI_CTL,
-                  VC4_SET_FIELD(params->channels, VC4_HD_MAI_CTL_CHNUM) |
+                  VC4_SET_FIELD(channels, VC4_HD_MAI_CTL_CHNUM) |
                   VC4_HD_MAI_CTL_WHOLSMP |
                   VC4_HD_MAI_CTL_CHALIGN |
                   VC4_HD_MAI_CTL_ENABLE);
 
-       vc4_hdmi_audio_set_mai_clock(vc4_hdmi);
+       vc4_hdmi_audio_set_mai_clock(vc4_hdmi, sample_rate);
 
-       mai_sample_rate = sample_rate_to_mai_fmt(vc4_hdmi->audio.samplerate);
+       mai_sample_rate = sample_rate_to_mai_fmt(sample_rate);
        if (params->iec.status[0] & IEC958_AES0_NONAUDIO &&
            params->channels == 8)
                mai_audio_format = VC4_HDMI_MAI_FORMAT_HBR;
@@ -1202,7 +1200,7 @@ static int vc4_hdmi_audio_prepare(struct device *dev, 
void *data,
                VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_INACTIVE_CHANNELS |
                VC4_SET_FIELD(0x8, VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER);
 
-       channel_mask = GENMASK(vc4_hdmi->audio.channels - 1, 0);
+       channel_mask = GENMASK(channels - 1, 0);
        audio_packet_config |= VC4_SET_FIELD(channel_mask,
                                             VC4_HDMI_AUDIO_PACKET_CEA_MASK);
 
@@ -1221,7 +1219,7 @@ static int vc4_hdmi_audio_prepare(struct device *dev, 
void *data,
        channel_map = vc4_hdmi->variant->channel_map(vc4_hdmi, channel_mask);
        HDMI_WRITE(HDMI_MAI_CHANNEL_MAP, channel_map);
        HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config);
-       vc4_hdmi_set_n_cts(vc4_hdmi);
+       vc4_hdmi_set_n_cts(vc4_hdmi, sample_rate);
 
        memcpy(&vc4_hdmi->audio.infoframe, &params->cea, sizeof(params->cea));
        vc4_hdmi_set_audio_infoframe(encoder);
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
index fdee27faafa3..574f379faf93 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -108,8 +108,6 @@ struct vc4_hdmi_audio {
        struct snd_soc_dai_link_component cpu;
        struct snd_soc_dai_link_component codec;
        struct snd_soc_dai_link_component platform;
-       int samplerate;
-       int channels;
        struct snd_dmaengine_dai_dma_data dma_data;
        struct hdmi_audio_infoframe infoframe;
        bool streaming;
-- 
2.31.1