[PATCH 08/13] drm/i915/hdcp: Keep cp fw agonstic naming convention

[Winkler, Tomas]

> From: Anshuman Gupta <anshuman.gupta at intel.com>
> 
> Change the include/drm/i915_mei_hdcp_interface.h to
> include/drm/i915_cp_fw_hdcp_interface.h
> 
> Cc: Tomas Winkler <tomas.winkler at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Uma Shankar <uma.shankar at intel.com>
> Cc: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta at intel.com>
> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>


Acked-by: Tomas Winkler <tomas.winkler at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display_types.h          | 2 +-
>  drivers/misc/mei/hdcp/mei_hdcp.c                            | 2 +-
>  ...915_mei_hdcp_interface.h => i915_cp_fw_hdcp_interface.h} | 6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)  rename
> include/drm/{i915_mei_hdcp_interface.h => i915_cp_fw_hdcp_interface.h}
> (97%)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h
> b/drivers/gpu/drm/i915/display/intel_display_types.h
> index ff3ef37d099e..8619240e63c1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -43,7 +43,7 @@
>  #include <drm/drm_rect.h>
>  #include <drm/drm_vblank.h>
>  #include <drm/drm_vblank_work.h>
> -#include <drm/i915_mei_hdcp_interface.h>
> +#include <drm/i915_cp_fw_hdcp_interface.h>
>  #include <media/cec-notifier.h>
> 
>  #include "i915_vma.h"
> diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c
> b/drivers/misc/mei/hdcp/mei_hdcp.c
> index e889a8bd7ac8..7e3cd3fd7f7b 100644
> --- a/drivers/misc/mei/hdcp/mei_hdcp.c
> +++ b/drivers/misc/mei/hdcp/mei_hdcp.c
> @@ -23,7 +23,7 @@
>  #include <linux/component.h>
>  #include <drm/drm_connector.h>
>  #include <drm/i915_component.h>
> -#include <drm/i915_mei_hdcp_interface.h>
> +#include <drm/i915_cp_fw_hdcp_interface.h>
> 
>  #include "mei_hdcp.h"
> 
> diff --git a/include/drm/i915_mei_hdcp_interface.h
> b/include/drm/i915_cp_fw_hdcp_interface.h
> similarity index 97%
> rename from include/drm/i915_mei_hdcp_interface.h
> rename to include/drm/i915_cp_fw_hdcp_interface.h
> index f441cbcd95a4..e5dc6b985b2f 100644
> --- a/include/drm/i915_mei_hdcp_interface.h
> +++ b/include/drm/i915_cp_fw_hdcp_interface.h
> @@ -6,8 +6,8 @@
>   * Ramalingam C <ramalingam.c at intel.com>
>   */
> 
> -#ifndef _I915_MEI_HDCP_INTERFACE_H_
> -#define _I915_MEI_HDCP_INTERFACE_H_
> +#ifndef _I915_CP_FW_HDCP_INTERFACE_H_
> +#define _I915_CP_FW_HDCP_INTERFACE_H_
> 
>  #include <linux/mutex.h>
>  #include <linux/device.h>
> @@ -181,4 +181,4 @@ struct i915_hdcp_comp_master {
>  	struct mutex mutex;
>  };
> 
> -#endif /* _I915_MEI_HDCP_INTERFACE_H_ */
> +#endif /* _I915_CP_FW_HDCP_INTERFACE_H_ */
> --
> 2.25.1