Commit 71abfcbe authored by Jani Nikula's avatar Jani Nikula
parent 8b986e2a
...@@ -868,7 +868,6 @@ static const struct i2c_lock_operations gmbus_lock_ops = { ...@@ -868,7 +868,6 @@ static const struct i2c_lock_operations gmbus_lock_ops = {
int intel_gmbus_setup(struct drm_i915_private *dev_priv) int intel_gmbus_setup(struct drm_i915_private *dev_priv)
{ {
struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev); struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
struct intel_gmbus *bus;
unsigned int pin; unsigned int pin;
int ret; int ret;
...@@ -886,6 +885,7 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv) ...@@ -886,6 +885,7 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv)
for (pin = 0; pin < ARRAY_SIZE(dev_priv->gmbus); pin++) { for (pin = 0; pin < ARRAY_SIZE(dev_priv->gmbus); pin++) {
const struct gmbus_pin *gmbus_pin; const struct gmbus_pin *gmbus_pin;
struct intel_gmbus *bus;
gmbus_pin = get_gmbus_pin(dev_priv, pin); gmbus_pin = get_gmbus_pin(dev_priv, pin);
if (!gmbus_pin) if (!gmbus_pin)
...@@ -978,10 +978,11 @@ bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter) ...@@ -978,10 +978,11 @@ bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
void intel_gmbus_teardown(struct drm_i915_private *dev_priv) void intel_gmbus_teardown(struct drm_i915_private *dev_priv)
{ {
struct intel_gmbus *bus;
unsigned int pin; unsigned int pin;
for (pin = 0; pin < ARRAY_SIZE(dev_priv->gmbus); pin++) { for (pin = 0; pin < ARRAY_SIZE(dev_priv->gmbus); pin++) {
struct intel_gmbus *bus;
bus = dev_priv->gmbus[pin]; bus = dev_priv->gmbus[pin];
if (!bus) if (!bus)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment