drm/i915: Clean up transcoder_to_stream_enc_status()

Drop the pointless middle man variable and just return the
correct thing directly.  And while at it change the return
type to u32 since this is a register value we're returning.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220912111814.17466-3-ville.syrjala@linux.intel.com
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 88689124c013d1f84b857b3a093ae61d21423903..35360dd543ac88490e9d079c27bb259b4320a81a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -19,28 +19,20 @@
 #include "intel_hdcp.h"
 #include "intel_hdcp_regs.h"
 
-static unsigned int transcoder_to_stream_enc_status(enum transcoder cpu_transcoder)
+static u32 transcoder_to_stream_enc_status(enum transcoder cpu_transcoder)
 {
-       u32 stream_enc_mask;
-
        switch (cpu_transcoder) {
        case TRANSCODER_A:
-               stream_enc_mask = HDCP_STATUS_STREAM_A_ENC;
-               break;
+               return HDCP_STATUS_STREAM_A_ENC;
        case TRANSCODER_B:
-               stream_enc_mask = HDCP_STATUS_STREAM_B_ENC;
-               break;
+               return HDCP_STATUS_STREAM_B_ENC;
        case TRANSCODER_C:
-               stream_enc_mask = HDCP_STATUS_STREAM_C_ENC;
-               break;
+               return HDCP_STATUS_STREAM_C_ENC;
        case TRANSCODER_D:
-               stream_enc_mask = HDCP_STATUS_STREAM_D_ENC;
-               break;
+               return HDCP_STATUS_STREAM_D_ENC;
        default:
-               stream_enc_mask = 0;
+               return 0;
        }
-
-       return stream_enc_mask;
 }
 
 static void intel_dp_hdcp_wait_for_cp_irq(struct intel_hdcp *hdcp, int timeout)