linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tom Duffy <tduffy@sun.com>
To: Hal Rosenstock <halr@voltaire.com>
Cc: Andrew Morton <akpm@osdl.org>,
	linux-kernel@vger.kernel.org, openib-general@openib.org
Subject: Re: [openib-general] [PATCH 26/29v2] Add kernel portion of user CM implementation
Date: Mon, 11 Jul 2005 14:19:28 -0700	[thread overview]
Message-ID: <1121116768.3028.9.camel@duffman> (raw)
In-Reply-To: <1121110427.4389.5036.camel@hal.voltaire.com>

On Mon, 2005-07-11 at 16:59 -0400, Hal Rosenstock wrote:
> Add kernel portion of user CM implementation

Hal, does this compile?  As it doesn't seem to include the patch I sent
to openib-general changing class_simple to class, I don't think it
should work on 2.6.13-rc.

[ also, in future patch bombs, could you please set the references
header so that the message thread properly, thanks ]

Signed-off-by: Tom Duffy <tduffy@sun.com>

Index: linux-2.6.13-rc2-openib/drivers/infiniband/core/ucm.c
===================================================================
--- linux-2.6.13-rc2-openib/drivers/infiniband/core/ucm.c	(revision 2832)
+++ linux-2.6.13-rc2-openib/drivers/infiniband/core/ucm.c	(working copy)
@@ -1339,7 +1339,7 @@ static struct file_operations ib_ucm_fop
 };
 
 
-static struct class_simple *ib_ucm_class;
+static struct class *ib_ucm_class;
 static struct cdev	  ib_ucm_cdev;
 
 static int __init ib_ucm_init(void)
@@ -1360,17 +1360,14 @@ static int __init ib_ucm_init(void)
 		goto err_cdev;
 	}
 
-	ib_ucm_class = class_simple_create(THIS_MODULE, "infiniband_cm");
+	ib_ucm_class = class_create(THIS_MODULE, "infiniband_cm");
 	if (IS_ERR(ib_ucm_class)) {
 		result = PTR_ERR(ib_ucm_class);
 		printk(KERN_ERR "UCM: Error <%d> creating class\n", result);
 		goto err_class;
 	}
 
-	class_simple_device_add(ib_ucm_class,
-				IB_UCM_DEV,
-				NULL,
-				"ucm");
+	class_device_create(ib_ucm_class, IB_UCM_DEV, NULL, "ucm");
 	
 	idr_init(&ctx_id_table);
 	init_MUTEX(&ctx_id_mutex);
@@ -1386,8 +1383,8 @@ err_chr:
 
 static void __exit ib_ucm_cleanup(void)
 {
-	class_simple_device_remove(IB_UCM_DEV);
-	class_simple_destroy(ib_ucm_class);
+	class_device_destroy(ib_ucm_class, IB_UCM_DEV);
+	class_destroy(ib_ucm_class);
 	cdev_del(&ib_ucm_cdev);
 	unregister_chrdev_region(IB_UCM_DEV, 1);
 }


  reply	other threads:[~2005-07-11 21:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-11 20:59 [PATCH 26/29v2] Add kernel portion of user CM implementation Hal Rosenstock
2005-07-11 21:19 ` Tom Duffy [this message]
2005-07-11 23:16   ` [openib-general] " Hal Rosenstock

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1121116768.3028.9.camel@duffman \
    --to=tduffy@sun.com \
    --cc=akpm@osdl.org \
    --cc=halr@voltaire.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=openib-general@openib.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).