diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-12-01 14:16:43 +0000 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2016-12-01 18:01:23 +0000 |
| commit | 12ff05e750dff5ae098e8b2803363d9707214735 (patch) | |
| tree | 131500e0686d5f1bc9104bb8869a3adceb0da6ba /drivers/gpu/drm/i915/i915_sysfs.c | |
| parent | 401964465f04f3c01dd7ddfe6b5149bc33eaa509 (diff) | |
| download | talos-obmc-linux-12ff05e750dff5ae098e8b2803363d9707214735.tar.gz talos-obmc-linux-12ff05e750dff5ae098e8b2803363d9707214735.zip | |
drm/i915: Make i915_destroy_error_state take dev_priv
Since it does not need dev at all.
Also change the stored pointer in struct i915_error_state_file_priv
to i915.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_sysfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index 47590ab08d7e..b99fd9668317 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -535,7 +535,7 @@ static ssize_t error_state_read(struct file *filp, struct kobject *kobj, if (ret) return ret; - error_priv.dev = dev; + error_priv.i915 = dev_priv; i915_error_state_get(dev, &error_priv); ret = i915_error_state_to_str(&error_str, &error_priv); @@ -560,7 +560,7 @@ static ssize_t error_state_write(struct file *file, struct kobject *kobj, struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); DRM_DEBUG_DRIVER("Resetting error state\n"); - i915_destroy_error_state(&dev_priv->drm); + i915_destroy_error_state(dev_priv); return count; } |
