From 71abfcbeae3e8b48c40c0ff58cec907269b7db73 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 4 Mar 2022 12:14:25 +0200 Subject: [PATCH] drm/i915/gmbus: move some local bus variables within loops MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Limit the scope. Suggested-by: Ville Syrjälä Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20220304101426.1891347-1-jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_gmbus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c index 2bb3494b93e2..8f26528c3dc7 100644 --- a/drivers/gpu/drm/i915/display/intel_gmbus.c +++ b/drivers/gpu/drm/i915/display/intel_gmbus.c @@ -868,7 +868,6 @@ static const struct i2c_lock_operations gmbus_lock_ops = { int intel_gmbus_setup(struct drm_i915_private *dev_priv) { struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev); - struct intel_gmbus *bus; unsigned int pin; int ret; @@ -886,6 +885,7 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv) for (pin = 0; pin < ARRAY_SIZE(dev_priv->gmbus); pin++) { const struct gmbus_pin *gmbus_pin; + struct intel_gmbus *bus; gmbus_pin = get_gmbus_pin(dev_priv, pin); if (!gmbus_pin) @@ -978,10 +978,11 @@ bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) void intel_gmbus_teardown(struct drm_i915_private *dev_priv) { - struct intel_gmbus *bus; unsigned int pin; for (pin = 0; pin < ARRAY_SIZE(dev_priv->gmbus); pin++) { + struct intel_gmbus *bus; + bus = dev_priv->gmbus[pin]; if (!bus) continue;