From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [RFC 01/44] drm/i915: Corrected 'file_priv' to 'file' in 'i915_driver_preclose()' Date: Mon, 7 Jul 2014 20:02:19 +0200 Message-ID: <20140707180219.GT5821@phenom.ffwll.local> References: <1403803475-16337-1-git-send-email-John.C.Harrison@Intel.com> <1403803475-16337-2-git-send-email-John.C.Harrison@Intel.com> <20140630140318.209e5819@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTP id BF7126E471 for ; Mon, 7 Jul 2014 11:02:09 -0700 (PDT) Received: by mail-wi0-f181.google.com with SMTP id n3so7367343wiv.14 for ; Mon, 07 Jul 2014 11:02:09 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20140630140318.209e5819@jbarnes-desktop> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jesse Barnes Cc: Intel-GFX@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Jun 30, 2014 at 02:03:18PM -0700, Jesse Barnes wrote: > On Thu, 26 Jun 2014 18:23:52 +0100 > John.C.Harrison@Intel.com wrote: > > > From: John Harrison > > > > The 'i915_driver_preclose()' function has a parameter called 'file_priv'. > > However, this is misleading as the structure it points to is a 'drm_file' not a > > 'drm_i915_file_private'. It should be named just 'file' to avoid confusion. sob line is missing, but I've added that since we work for the same company ;-) Please make sure you'll get these details right, checkpatch.pl will help. Queued for -next, thanks for the patch. -Daniel > > --- > > drivers/gpu/drm/i915/i915_dma.c | 6 +++--- > > drivers/gpu/drm/i915/i915_drv.h | 6 +++--- > > 2 files changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > > index b9159ad..6cce55b 100644 > > --- a/drivers/gpu/drm/i915/i915_dma.c > > +++ b/drivers/gpu/drm/i915/i915_dma.c > > @@ -1916,11 +1916,11 @@ void i915_driver_lastclose(struct drm_device * dev) > > i915_dma_cleanup(dev); > > } > > > > -void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv) > > +void i915_driver_preclose(struct drm_device *dev, struct drm_file *file) > > { > > mutex_lock(&dev->struct_mutex); > > - i915_gem_context_close(dev, file_priv); > > - i915_gem_release(dev, file_priv); > > + i915_gem_context_close(dev, file); > > + i915_gem_release(dev, file); > > mutex_unlock(&dev->struct_mutex); > > } > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index bea9ab40..7a96ca0 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -2044,12 +2044,12 @@ void i915_update_dri1_breadcrumb(struct drm_device *dev); > > extern void i915_kernel_lost_context(struct drm_device * dev); > > extern int i915_driver_load(struct drm_device *, unsigned long flags); > > extern int i915_driver_unload(struct drm_device *); > > -extern int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv); > > +extern int i915_driver_open(struct drm_device *dev, struct drm_file *file); > > extern void i915_driver_lastclose(struct drm_device * dev); > > extern void i915_driver_preclose(struct drm_device *dev, > > - struct drm_file *file_priv); > > + struct drm_file *file); > > extern void i915_driver_postclose(struct drm_device *dev, > > - struct drm_file *file_priv); > > + struct drm_file *file); > > extern int i915_driver_device_is_agp(struct drm_device * dev); > > #ifdef CONFIG_COMPAT > > extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, > > Reviewed-by: Jesse Barnes > > -- > Jesse Barnes, Intel Open Source Technology Center > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch