diff options
| author | Jani Nikula | 2017-09-28 10:22:00 +0200 |
|---|---|---|
| committer | Jani Nikula | 2017-10-10 08:05:54 +0200 |
| commit | 127704f5475a1913c284efa08376ec89ec513789 (patch) | |
| tree | d8b3305efff2dfed70f7ce3d9fca0043ab1242b7 /drivers/gpu/drm/i915 | |
| parent | drm/i915/bios: don't initialize fields based on vbt version (diff) | |
| download | kernel-qcow2-linux-127704f5475a1913c284efa08376ec89ec513789.tar.gz kernel-qcow2-linux-127704f5475a1913c284efa08376ec89ec513789.tar.xz kernel-qcow2-linux-127704f5475a1913c284efa08376ec89ec513789.zip | |
drm/i915/bios: remove an unnecessary temp variable
Prepare for merging parse_device_mapping() into
parse_general_definitions(). No functional changes.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f1c3621e2622f4debdfb4a2f5c1959845754ac04.1506586821.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index c91cdf131465..2b72a7a520ce 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1265,7 +1265,6 @@ parse_device_mapping(struct drm_i915_private *dev_priv, { const struct bdb_general_definitions *defs; const struct child_device_config *child; - struct child_device_config *child_dev_ptr; int i, child_device_num, count; u8 expected_size; u16 block_size; @@ -1337,16 +1336,14 @@ parse_device_mapping(struct drm_i915_private *dev_priv, continue; } - child_dev_ptr = dev_priv->vbt.child_dev + count; - count++; - /* * Copy as much as we know (sizeof) and is available * (child_dev_size) of the child device. Accessing the data must * depend on VBT version. */ - memcpy(child_dev_ptr, child, + memcpy(dev_priv->vbt.child_dev + count, child, min_t(size_t, defs->child_dev_size, sizeof(*child))); + count++; } return; } |