Commit eb51b650 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman

[PATCH] fix up ipmi code after class_simple.c removal

Cc: Corey Minyard <minyard@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 733a366c
...@@ -520,7 +520,7 @@ MODULE_PARM_DESC(ipmi_major, "Sets the major number of the IPMI device. By" ...@@ -520,7 +520,7 @@ MODULE_PARM_DESC(ipmi_major, "Sets the major number of the IPMI device. By"
" interface. Other values will set the major device number" " interface. Other values will set the major device number"
" to that value."); " to that value.");
static struct class_simple *ipmi_class; static struct class *ipmi_class;
static void ipmi_new_smi(int if_num) static void ipmi_new_smi(int if_num)
{ {
...@@ -529,12 +529,12 @@ static void ipmi_new_smi(int if_num) ...@@ -529,12 +529,12 @@ static void ipmi_new_smi(int if_num)
devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR, devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
"ipmidev/%d", if_num); "ipmidev/%d", if_num);
class_simple_device_add(ipmi_class, dev, NULL, "ipmi%d", if_num); class_device_create(ipmi_class, dev, NULL, "ipmi%d", if_num);
} }
static void ipmi_smi_gone(int if_num) static void ipmi_smi_gone(int if_num)
{ {
class_simple_device_remove(MKDEV(ipmi_major, if_num)); class_device_destroy(ipmi_class, MKDEV(ipmi_major, if_num));
devfs_remove("ipmidev/%d", if_num); devfs_remove("ipmidev/%d", if_num);
} }
...@@ -555,7 +555,7 @@ static __init int init_ipmi_devintf(void) ...@@ -555,7 +555,7 @@ static __init int init_ipmi_devintf(void)
printk(KERN_INFO "ipmi device interface version " printk(KERN_INFO "ipmi device interface version "
IPMI_DEVINTF_VERSION "\n"); IPMI_DEVINTF_VERSION "\n");
ipmi_class = class_simple_create(THIS_MODULE, "ipmi"); ipmi_class = class_create(THIS_MODULE, "ipmi");
if (IS_ERR(ipmi_class)) { if (IS_ERR(ipmi_class)) {
printk(KERN_ERR "ipmi: can't register device class\n"); printk(KERN_ERR "ipmi: can't register device class\n");
return PTR_ERR(ipmi_class); return PTR_ERR(ipmi_class);
...@@ -563,7 +563,7 @@ static __init int init_ipmi_devintf(void) ...@@ -563,7 +563,7 @@ static __init int init_ipmi_devintf(void)
rv = register_chrdev(ipmi_major, DEVICE_NAME, &ipmi_fops); rv = register_chrdev(ipmi_major, DEVICE_NAME, &ipmi_fops);
if (rv < 0) { if (rv < 0) {
class_simple_destroy(ipmi_class); class_destroy(ipmi_class);
printk(KERN_ERR "ipmi: can't get major %d\n", ipmi_major); printk(KERN_ERR "ipmi: can't get major %d\n", ipmi_major);
return rv; return rv;
} }
...@@ -577,7 +577,7 @@ static __init int init_ipmi_devintf(void) ...@@ -577,7 +577,7 @@ static __init int init_ipmi_devintf(void)
rv = ipmi_smi_watcher_register(&smi_watcher); rv = ipmi_smi_watcher_register(&smi_watcher);
if (rv) { if (rv) {
unregister_chrdev(ipmi_major, DEVICE_NAME); unregister_chrdev(ipmi_major, DEVICE_NAME);
class_simple_destroy(ipmi_class); class_destroy(ipmi_class);
printk(KERN_WARNING "ipmi: can't register smi watcher\n"); printk(KERN_WARNING "ipmi: can't register smi watcher\n");
return rv; return rv;
} }
...@@ -588,7 +588,7 @@ module_init(init_ipmi_devintf); ...@@ -588,7 +588,7 @@ module_init(init_ipmi_devintf);
static __exit void cleanup_ipmi(void) static __exit void cleanup_ipmi(void)
{ {
class_simple_destroy(ipmi_class); class_destroy(ipmi_class);
ipmi_smi_watcher_unregister(&smi_watcher); ipmi_smi_watcher_unregister(&smi_watcher);
devfs_remove(DEVICE_NAME); devfs_remove(DEVICE_NAME);
unregister_chrdev(ipmi_major, DEVICE_NAME); unregister_chrdev(ipmi_major, DEVICE_NAME);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment