[Intel-gfx] [PATCH] drm/i915/hdcp: Silence compiler critics

[Ville Syrjälä]

On Thu, Feb 21, 2019 at 08:48:33AM +0000, Chris Wilson wrote:
> drivers/gpu/drm/i915/intel_hdcp.c:92 intel_hdcp2_capable() warn: inconsistent indenting
> drivers/gpu/drm/i915/intel_hdcp.c:786:5: error: no previous prototype for ‘intel_hdcp_check_link’
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/intel_hdcp.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
> index 6178fe93f398..9ce09f67776d 100644
> --- a/drivers/gpu/drm/i915/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/intel_hdcp.c
> @@ -89,10 +89,10 @@ static bool intel_hdcp2_capable(struct intel_connector *connector)
>  
>  	/* MEI interface is solid */
>  	mutex_lock(&dev_priv->hdcp_comp_mutex);
> -		if (!dev_priv->hdcp_comp_added ||  !dev_priv->hdcp_master) {
> -			mutex_unlock(&dev_priv->hdcp_comp_mutex);
> -			return false;
> -		}
> +	if (!dev_priv->hdcp_comp_added ||  !dev_priv->hdcp_master) {
                                         ^^

That too looks a bit funky.

> +		mutex_unlock(&dev_priv->hdcp_comp_mutex);
> +		return false;
> +	}
>  	mutex_unlock(&dev_priv->hdcp_comp_mutex);
>  
>  	/* Sink's capability for HDCP2.2 */
> @@ -783,7 +783,7 @@ struct intel_connector *intel_hdcp_to_connector(struct intel_hdcp *hdcp)
>  }
>  
>  /* Implements Part 3 of the HDCP authorization procedure */
> -int intel_hdcp_check_link(struct intel_connector *connector)
> +static int intel_hdcp_check_link(struct intel_connector *connector)
>  {
>  	struct intel_hdcp *hdcp = &connector->hdcp;
>  	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
> -- 
> 2.20.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel