From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1754931AbYLSWfb@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754931AbYLSWfb (ORCPT <rfc822;w@1wt.eu>);
	Fri, 19 Dec 2008 17:35:31 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752676AbYLSWfW
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Fri, 19 Dec 2008 17:35:22 -0500
Received: from mail-gx0-f13.google.com ([209.85.217.13]:38170 "EHLO
	mail-gx0-f13.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751561AbYLSWfV (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 19 Dec 2008 17:35:21 -0500
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:cc:in-reply-to:mime-version
         :content-type:content-transfer-encoding:content-disposition
         :references;
        b=LNMCdNUmjfkB99UUhWyKExo9mIKXPljZMJE3ooinunQO/6iBkWhy2T8AiNOt1gIcwM
         mGHozg1M6/aB8mWJyTUSIpWH7edfB6eXRav1emj0+MRGML0qedmv1mQA6RYCFonwLlh9
         jfO8Sy/YWjE/wQvUvzRNJkGxq+pOOZBPuLmKY=
Message-ID: <21d7e9970812191435g645c03ebqdcd53930d52f4830@mail.gmail.com>
Date: Sat, 20 Dec 2008 08:35:19 +1000
From: "Dave Airlie" <airlied@gmail.com>
To: "Julia Lawall" <julia@diku.dk>
Subject: Re: [PATCH 1/3] drivers/gpu/drm: Move a dereference below a NULL test
Cc: airlied@linux.ie, dri-devel@lists.sourceforge.net,
       linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
In-Reply-To: <Pine.LNX.4.64.0812191809490.11217@ask.diku.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <Pine.LNX.4.64.0812191809490.11217@ask.diku.dk>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sat, Dec 20, 2008 at 3:10 AM, Julia Lawall <julia@diku.dk> wrote:
> From: Julia Lawall <julia@diku.dk>
>
> If the NULL test is necessary, then the dereference should be moved below
> the NULL test.
>
> The semantic patch that makes this change is as follows:
> (http://www.emn.fr/x-info/coccinelle/).  The result has been modified to
> move the initialization of driver down closer to where it is used.
>
> // <smpl>
> @@
> type T;
> expression E;
> identifier i,fld;
> statement S;
> @@
>
> - T i = E->fld;
> + T i;
>  ... when != E
>      when != i
>  if (E == NULL) S
> + i = E->fld;
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
>  drivers/gpu/drm/drm_drv.c |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 0b9f316..4bdfc98 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -297,7 +297,7 @@ EXPORT_SYMBOL(drm_init);
>  */
>  static void drm_cleanup(struct drm_device * dev)
>  {
> -       struct drm_driver *driver = dev->driver;
> +       struct drm_driver *driver;
>
>        DRM_DEBUG("\n");
>
> @@ -324,8 +324,9 @@ static void drm_cleanup(struct drm_device * dev)
>                dev->agp = NULL;
>        }
>
> -       if (dev->driver->unload)
> -               dev->driver->unload(dev);
> +       driver = dev->driver;
> +       if (driver->unload)
> +               driver->unload(dev);

Huh?

The original test is to check it dev->driver->unload exists, not it
dev->driver exists.

I think your test  parameters are wrong.

Dave.

>
>        drm_ht_remove(&dev->map_hash);
>        drm_ctxbitmap_cleanup(dev);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>