summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-09-25 02:03:03 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 20:40:07 -0800
commit02ff82cac7ee7351d2649c4a3568f12e4e0fe534 (patch)
tree02b4ff60236f893d6db3a94fe56fcf80f39b42a6
parent7dd817d083b6fc103b9ea4f2b4f4a1c6a09e29a0 (diff)
downloadop-kernel-dev-02ff82cac7ee7351d2649c4a3568f12e4e0fe534.zip
op-kernel-dev-02ff82cac7ee7351d2649c4a3568f12e4e0fe534.tar.gz
cosa: Convert from class_device to device for cosa sync driver
struct class_device is going away, this converts the code to use struct device instead. Signed-off-by: Tony Jones <tonyj@suse.de> Cc: Jan "Yenya" Kasprzak <kas@fi.muni.cz> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/wan/cosa.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index ff37bf4..1d706ea 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -395,8 +395,7 @@ static int __init cosa_init(void)
goto out_chrdev;
}
for (i=0; i<nr_cards; i++) {
- class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),
- NULL, "cosa%d", i);
+ device_create(cosa_class, NULL, MKDEV(cosa_major, i), "cosa%d", i);
}
err = 0;
goto out;
@@ -415,7 +414,7 @@ static void __exit cosa_exit(void)
printk(KERN_INFO "Unloading the cosa module\n");
for (i=0; i<nr_cards; i++)
- class_device_destroy(cosa_class, MKDEV(cosa_major, i));
+ device_destroy(cosa_class, MKDEV(cosa_major, i));
class_destroy(cosa_class);
for (cosa=cosa_cards; nr_cards--; cosa++) {
/* Clean up the per-channel data */
OpenPOWER on IntegriCloud