From 6833b82e98af18954fa4d13dc9975e97afc8338f Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Wed, 15 Mar 2017 14:34:15 +0100 Subject: 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 Cc: Oscar Mateo Signed-off-by: Arkadiusz Hiler Reviewed-by: Michal Wajdeczko Signed-off-by: Tvrtko Ursulin Link: http://patchwork.freedesktop.org/patch/msgid/20170315133415.15343-1-arkadiusz.hiler@intel.com --- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/drm/i915/intel_uc.c') 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; } -- cgit v1.2.3