From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Date: Wed, 15 Mar 2017 13:34:15 +0000 (+0100)
Subject: drm/i915/uc: Rename intel_uc_fw.fw to .type
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6833b82e98af18954fa4d13dc9975e97afc8338f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/i915/uc: Rename intel_uc_fw.fw to .type

This field is used to determine which kind of firmware the struct
describes (GuC/HuC) - the name does not reflect.

The enum used here have "type" in the name, so let's go with that.

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170315133415.15343-1-arkadiusz.hiler@intel.com
---

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index d1d183b2f365..2f270d02894c 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -405,7 +405,7 @@ int intel_guc_select_fw(struct intel_guc *guc)
 	guc->fw.path = NULL;
 	guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE;
 	guc->fw.load_status = INTEL_UC_FIRMWARE_NONE;
-	guc->fw.fw = INTEL_UC_FW_TYPE_GUC;
+	guc->fw.type = INTEL_UC_FW_TYPE_GUC;
 
 	if (i915.guc_firmware_path) {
 		guc->fw.path = i915.guc_firmware_path;
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index ab4ee08c3d44..7af900bcdc05 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -151,7 +151,7 @@ void intel_huc_select_fw(struct intel_huc *huc)
 	huc->fw.path = NULL;
 	huc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE;
 	huc->fw.load_status = INTEL_UC_FIRMWARE_NONE;
-	huc->fw.fw = INTEL_UC_FW_TYPE_HUC;
+	huc->fw.type = INTEL_UC_FW_TYPE_HUC;
 
 	if (i915.huc_firmware_path) {
 		huc->fw.path = i915.huc_firmware_path;
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index c31f05a641c0..9671d147b528 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -331,7 +331,7 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
 	 * version are TWO bytes each (i.e. u16), although all pointers and
 	 * offsets are defined in terms of bytes (u8).
 	 */
-	switch (uc_fw->fw) {
+	switch (uc_fw->type) {
 	case INTEL_UC_FW_TYPE_GUC:
 		/* Header and uCode will be loaded to WOPCM. Size of the two. */
 		size = uc_fw->header_size + uc_fw->ucode_size;
@@ -351,7 +351,7 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
 		break;
 
 	default:
-		DRM_ERROR("Unknown firmware type %d\n", uc_fw->fw);
+		DRM_ERROR("Unknown firmware type %d\n", uc_fw->type);
 		err = -ENOEXEC;
 		goto fail;
 	}
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h
index 170dd700bce7..a35ededfaa40 100644
--- a/drivers/gpu/drm/i915/intel_uc.h
+++ b/drivers/gpu/drm/i915/intel_uc.h
@@ -121,7 +121,7 @@ struct intel_uc_fw {
 	uint16_t major_ver_found;
 	uint16_t minor_ver_found;
 
-	enum intel_uc_fw_type fw;
+	enum intel_uc_fw_type type;
 	uint32_t header_size;
 	uint32_t header_offset;
 	uint32_t rsa_size;