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
This commit is contained in:
Arkadiusz Hiler
2017-03-15 14:34:15 +01:00
کامیت شده توسط Tvrtko Ursulin
والد a6b0a14128
کامیت 6833b82e98
4فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده

مشاهده پرونده

@@ -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;
}