Re: [patch 14/14] Convert from class_device to device for ISDN capi

[Tony Jones <tonyj@suse.de>]

On Tue, Aug 21, 2007 at 11:14:12AM +0200, Karsten Keil wrote:
> On Mon, Aug 20, 2007 at 03:48:20PM -0700, tonyj@suse.de wrote:
> > -- 
> > Content-Disposition: inline; filename=isdn-capi.patch
> > 
> > Convert from class_device to device for drivers/isdn/capi.  This is
> > part of the work to eliminate struct class_device.
> > 
> 
> If you add a Signed-off-by:
> I'll ack this patch.

Sorry, I added one for the first but the remainders got lost in the cut-paste.

--------


Subject: Convert from class_device to device for ISDN capi

Convert from class_device to device for drivers/isdn/capi.  This is
part of the work to eliminate struct class_device.

Signed-off-by: Tony Jones <tonyj@suse.de>

---
 drivers/isdn/capi/capi.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1544,11 +1544,11 @@ static int __init capi_init(void)
 		return PTR_ERR(capi_class);
 	}
 
-	class_device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
+	device_create(capi_class, NULL, MKDEV(capi_major, 0), "capi");
 
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 	if (capinc_tty_init() < 0) {
-		class_device_destroy(capi_class, MKDEV(capi_major, 0));
+		device_destroy(capi_class, MKDEV(capi_major, 0));
 		class_destroy(capi_class);
 		unregister_chrdev(capi_major, "capi20");
 		return -ENOMEM;
@@ -1576,7 +1576,7 @@ static void __exit capi_exit(void)
 {
 	proc_exit();
 
-	class_device_destroy(capi_class, MKDEV(capi_major, 0));
+	device_destroy(capi_class, MKDEV(capi_major, 0));
 	class_destroy(capi_class);
 	unregister_chrdev(capi_major, "capi20");