[Intel-gfx] [PATCH 1/3] drm/i915/uc: Rationalise delimiters in filename macros

[Ceraolo Spurio, Daniele]

On 11/22/2022 12:09 PM, John.C.Harrison at Intel.com wrote:
> From: John Harrison <John.C.Harrison at Intel.com>
>
> The way delimieters (underscores and dots) were added to the UC
> filenames was different for different types of delimter. Rationalise

delimiter misspelled twice. Apart from this, it's a simple cleanup, so:

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>

Daniele

> them to all be done the same way - implicitly in the concatenation
> macro rather than explicitly in the file name prefix.
>
> Signed-off-by: John Harrison <John.C.Harrison at Intel.com>
> ---
>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 0c80ba51a4bdc..774c3d84a4243 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -118,35 +118,35 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
>    */
>   #define __MAKE_UC_FW_PATH_BLANK(prefix_, name_) \
>   	"i915/" \
> -	__stringify(prefix_) name_ ".bin"
> +	__stringify(prefix_) "_" name_ ".bin"
>   
>   #define __MAKE_UC_FW_PATH_MAJOR(prefix_, name_, major_) \
>   	"i915/" \
> -	__stringify(prefix_) name_ \
> +	__stringify(prefix_) "_" name_ "_" \
>   	__stringify(major_) ".bin"
>   
>   #define __MAKE_UC_FW_PATH_MMP(prefix_, name_, major_, minor_, patch_) \
>   	"i915/" \
> -	__stringify(prefix_) name_ \
> +	__stringify(prefix_) "_" name_  "_" \
>   	__stringify(major_) "." \
>   	__stringify(minor_) "." \
>   	__stringify(patch_) ".bin"
>   
>   /* Minor for internal driver use, not part of file name */
>   #define MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_) \
> -	__MAKE_UC_FW_PATH_MAJOR(prefix_, "_guc_", major_)
> +	__MAKE_UC_FW_PATH_MAJOR(prefix_, "guc", major_)
>   
>   #define MAKE_GUC_FW_PATH_MMP(prefix_, major_, minor_, patch_) \
> -	__MAKE_UC_FW_PATH_MMP(prefix_, "_guc_", major_, minor_, patch_)
> +	__MAKE_UC_FW_PATH_MMP(prefix_, "guc", major_, minor_, patch_)
>   
>   #define MAKE_HUC_FW_PATH_BLANK(prefix_) \
> -	__MAKE_UC_FW_PATH_BLANK(prefix_, "_huc")
> +	__MAKE_UC_FW_PATH_BLANK(prefix_, "huc")
>   
>   #define MAKE_HUC_FW_PATH_GSC(prefix_) \
> -	__MAKE_UC_FW_PATH_BLANK(prefix_, "_huc_gsc")
> +	__MAKE_UC_FW_PATH_BLANK(prefix_, "huc_gsc")
>   
>   #define MAKE_HUC_FW_PATH_MMP(prefix_, major_, minor_, patch_) \
> -	__MAKE_UC_FW_PATH_MMP(prefix_, "_huc_", major_, minor_, patch_)
> +	__MAKE_UC_FW_PATH_MMP(prefix_, "huc", major_, minor_, patch_)
>   
>   /*
>    * All blobs need to be declared via MODULE_FIRMWARE().