projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh/hwblk' into sh-latest
[cascardo/linux.git]
/
drivers
/
edac
/
mce_amd_inj.c
diff --git
a/drivers/edac/mce_amd_inj.c
b/drivers/edac/mce_amd_inj.c
index
73c3e26
..
885e8ad
100644
(file)
--- a/
drivers/edac/mce_amd_inj.c
+++ b/
drivers/edac/mce_amd_inj.c
@@
-11,7
+11,6
@@
*/
#include <linux/kobject.h>
*/
#include <linux/kobject.h>
-#include <linux/sysdev.h>
#include <linux/edac.h>
#include <linux/module.h>
#include <asm/mce.h>
#include <linux/edac.h>
#include <linux/module.h>
#include <asm/mce.h>
@@
-116,14
+115,14
@@
static struct edac_mce_attr *sysfs_attrs[] = { &mce_attr_status, &mce_attr_misc,
static int __init edac_init_mce_inject(void)
{
static int __init edac_init_mce_inject(void)
{
- struct
sysdev_class *edac_clas
s = NULL;
+ struct
bus_type *edac_subsy
s = NULL;
int i, err = 0;
int i, err = 0;
- edac_
class = edac_get_sysfs_clas
s();
- if (!edac_
clas
s)
+ edac_
subsys = edac_get_sysfs_subsy
s();
+ if (!edac_
subsy
s)
return -EINVAL;
return -EINVAL;
- mce_kobj = kobject_create_and_add("mce", &edac_
class->kset.
kobj);
+ mce_kobj = kobject_create_and_add("mce", &edac_
subsys->dev_root->
kobj);
if (!mce_kobj) {
printk(KERN_ERR "Error creating a mce kset.\n");
err = -ENOMEM;
if (!mce_kobj) {
printk(KERN_ERR "Error creating a mce kset.\n");
err = -ENOMEM;
@@
-147,7
+146,7
@@
err_sysfs_create:
kobject_del(mce_kobj);
err_mce_kobj:
kobject_del(mce_kobj);
err_mce_kobj:
- edac_put_sysfs_
clas
s();
+ edac_put_sysfs_
subsy
s();
return err;
}
return err;
}
@@
-161,7
+160,7
@@
static void __exit edac_exit_mce_inject(void)
kobject_del(mce_kobj);
kobject_del(mce_kobj);
- edac_put_sysfs_
clas
s();
+ edac_put_sysfs_
subsy
s();
}
module_init(edac_init_mce_inject);
}
module_init(edac_init_mce_inject);