On Mon, Dec 14, 2015 at 12:50:53PM +0200, Jani Nikula wrote:
> Hasn't been necessary since
> 
> commit 115719fceaa733d646e39cdce83cc32ddb891a49
> Author: Williams, Dan J <dan.j.willi...@intel.com>
> Date:   Mon Oct 12 21:12:57 2015 +0000
> 
>     i915: switch from acpi_os_ioremap to memremap
> 
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
> b/drivers/gpu/drm/i915/i915_debugfs.c
> index 24318b79bcfc..a9e1f18c36d1 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1842,25 +1842,18 @@ static int i915_opregion(struct seq_file *m, void 
> *unused)
>       struct drm_device *dev = node->minor->dev;
>       struct drm_i915_private *dev_priv = dev->dev_private;
>       struct intel_opregion *opregion = &dev_priv->opregion;
> -     void *data = kmalloc(OPREGION_SIZE, GFP_KERNEL);
>       int ret;
>  
> -     if (data == NULL)
> -             return -ENOMEM;
> -
>       ret = mutex_lock_interruptible(&dev->struct_mutex);
>       if (ret)
>               goto out;

A bit off topic, but I wonder what this locking is supposed to protect?

>  
> -     if (opregion->header) {
> -             memcpy(data, opregion->header, OPREGION_SIZE);
> -             seq_write(m, data, OPREGION_SIZE);
> -     }
> +     if (opregion->header)
> +             seq_write(m, opregion->header, OPREGION_SIZE);
>  
>       mutex_unlock(&dev->struct_mutex);
>  
>  out:
> -     kfree(data);
>       return 0;
>  }
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to