aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-09-24 20:03:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:05 -0500
commitd78b03683a6f96645d265abdd5c556547dc76d70 (patch)
tree2d65c0201082075c0a0fa7d2ba4c2e002f03d0a1 /drivers
parentdbc1272ed4a9ce45ecc50e7ea7d52e7413eb1a4f (diff)
ISDN: Convert from class_device to device for ISDN capi
Signed-off-by: Tony Jones <tonyj@suse.de> Cc: Kay Sievers <kay.sievers@vrfy.org> Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/capi/capi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index f449daef3eed..23ae66c76d47 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1544,11 +1544,11 @@ static int __init capi_init(void)
1544 return PTR_ERR(capi_class); 1544 return PTR_ERR(capi_class);
1545 } 1545 }
1546 1546
1547 class_device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi"); 1547 device_create(capi_class, NULL, MKDEV(capi_major, 0), "capi");
1548 1548
1549#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE 1549#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
1550 if (capinc_tty_init() < 0) { 1550 if (capinc_tty_init() < 0) {
1551 class_device_destroy(capi_class, MKDEV(capi_major, 0)); 1551 device_destroy(capi_class, MKDEV(capi_major, 0));
1552 class_destroy(capi_class); 1552 class_destroy(capi_class);
1553 unregister_chrdev(capi_major, "capi20"); 1553 unregister_chrdev(capi_major, "capi20");
1554 return -ENOMEM; 1554 return -ENOMEM;
@@ -1576,7 +1576,7 @@ static void __exit capi_exit(void)
1576{ 1576{
1577 proc_exit(); 1577 proc_exit();
1578 1578
1579 class_device_destroy(capi_class, MKDEV(capi_major, 0)); 1579 device_destroy(capi_class, MKDEV(capi_major, 0));
1580 class_destroy(capi_class); 1580 class_destroy(capi_class);
1581 unregister_chrdev(capi_major, "capi20"); 1581 unregister_chrdev(capi_major, "capi20");
1582 1582