Commit e5496ae1 authored by Patrick Mochel's avatar Patrick Mochel

[s390 xpram] Convert to use new system device API.

parent 9bbfa0fa
...@@ -48,12 +48,14 @@ ...@@ -48,12 +48,14 @@
#define PRINT_WARN(x...) printk(KERN_WARNING XPRAM_NAME " warning:" x) #define PRINT_WARN(x...) printk(KERN_WARNING XPRAM_NAME " warning:" x)
#define PRINT_ERR(x...) printk(KERN_ERR XPRAM_NAME " error:" x) #define PRINT_ERR(x...) printk(KERN_ERR XPRAM_NAME " error:" x)
static struct sysdev_class xpram_sysclass = {
set_kset_name("xpram"),
};
static struct sys_device xpram_sys_device = { static struct sys_device xpram_sys_device = {
.name = "S/390 expanded memory RAM disk", .id = 0,
.dev = { .cls = &xpram_sysclass,
.name = "S/390 expanded memory RAM disk",
.bus_id = "xpram",
},
}; };
typedef struct { typedef struct {
...@@ -485,6 +487,7 @@ static void __exit xpram_exit(void) ...@@ -485,6 +487,7 @@ static void __exit xpram_exit(void)
unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME); unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);
devfs_remove("slram"); devfs_remove("slram");
sys_device_unregister(&xpram_sys_device); sys_device_unregister(&xpram_sys_device);
sysdev_class_unregister(&xpram_sys_class);
} }
static int __init xpram_init(void) static int __init xpram_init(void)
...@@ -502,9 +505,15 @@ static int __init xpram_init(void) ...@@ -502,9 +505,15 @@ static int __init xpram_init(void)
rc = xpram_setup_sizes(xpram_pages); rc = xpram_setup_sizes(xpram_pages);
if (rc) if (rc)
return rc; return rc;
rc = sys_device_register(&xpram_sys_device); rc = sysdev_class_register(&xpram_sysclass);
if (rc) if (rc)
return rc; return rc;
rc = sys_device_register(&xpram_sys_device);
if (rc) {
sysdev_class_unregister(&xpram_syclass);
return rc;
}
rc = xpram_setup_blkdev(); rc = xpram_setup_blkdev();
if (rc) if (rc)
sys_device_unregister(&xpram_sys_device); sys_device_unregister(&xpram_sys_device);
......
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