[PATCH] drm/i915: Use string enable/disable choice helpers

Jani Nikula jani.nikula at linux.intel.com
Wed Oct 23 09:28:10 UTC 2024


On Wed, 23 Oct 2024, Sai Teja Pottumuttu <sai.teja.pottumuttu at intel.com> wrote:
> Replace the last few remaining instances of string enable(d)/disable(d)
> choices with the linux string choice helpers to avoid further
> cocci warnings.
>
> Signed-off-by: Sai Teja Pottumuttu <sai.teja.pottumuttu at intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 ++--
>  drivers/gpu/drm/i915/display/intel_pps.c     | 2 +-
>  drivers/gpu/drm/i915/display/intel_tc.c      | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> index dce645a07cdb..6a09b93742ff 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
> @@ -784,7 +784,7 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector,
>  			  stream_enc_status, enable ? stream_enc_status : 0,
>  			  HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
>  		drm_err(&i915->drm, "Timed out waiting for transcoder: %s stream encryption %s\n",
> -			transcoder_name(cpu_transcoder), enable ? "enabled" : "disabled");
> +			transcoder_name(cpu_transcoder), str_enabled_disabled(enable));
>  		return -ETIMEDOUT;
>  	}
>  
> @@ -818,7 +818,7 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,
>  			  enable ? STREAM_ENCRYPTION_STATUS : 0,
>  			  HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
>  		drm_err(&i915->drm, "Timed out waiting for transcoder: %s stream encryption %s\n",
> -			transcoder_name(cpu_transcoder), enable ? "enabled" : "disabled");
> +			transcoder_name(cpu_transcoder), str_enabled_disabled(enable));
>  		return -ETIMEDOUT;
>  	}
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
> index ffeee9daa568..5bea6404491f 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.c
> +++ b/drivers/gpu/drm/i915/display/intel_pps.c
> @@ -1148,7 +1148,7 @@ void intel_pps_backlight_power(struct intel_connector *connector, bool enable)
>  		return;
>  
>  	drm_dbg_kms(display->drm, "panel power control backlight %s\n",
> -		    enable ? "enable" : "disable");
> +		    str_enable_disable(enable));
>  
>  	if (enable)
>  		intel_pps_backlight_on(intel_dp);
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> index 6f2ee7dbc43b..b16c4d2d4077 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -1005,7 +1005,7 @@ xelpdp_tc_phy_wait_for_tcss_power(struct intel_tc_port *tc, bool enabled)
>  	if (wait_for(xelpdp_tc_phy_tcss_power_is_enabled(tc) == enabled, 5)) {
>  		drm_dbg_kms(&i915->drm,
>  			    "Port %s: timeout waiting for TCSS power to get %s\n",
> -			    enabled ? "enabled" : "disabled",
> +			    str_enabled_disabled(enabled),
>  			    tc->port_name);
>  		return false;
>  	}

-- 
Jani Nikula, Intel


More information about the Intel-gfx mailing list