Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-21 11:36:33 -07:00
parent 6af0c921a6 41c17d43e3
commit e63baa3490
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zpios/include/zpios-ctl.h
View File

@ -41,7 +41,8 @@
#endif #endif
#define ZPIOS_MAJOR 232 /* XXX - Arbitrary */ #define ZPIOS_MAJOR 232 /* XXX - Arbitrary */
#define ZPIOS_MINORS 1 #define ZPIOS_MINORS 1
#define ZPIOS_NAME "zpios"
#define ZPIOS_DEV "/dev/zpios" #define ZPIOS_DEV "/dev/zpios"
#define DMU_IO 0x01 #define DMU_IO 0x01

17
module/zpios/zpios.c
View File

@ -40,7 +40,8 @@
#include "zpios-internal.h" #include "zpios-internal.h"
static struct class *zpios_class; static spl_class *zpios_class;
static spl_device *zpios_device;
static static
@ -1237,7 +1238,7 @@ static struct file_operations zpios_fops = {
static struct cdev zpios_cdev = { static struct cdev zpios_cdev = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.kobj = { .name = "zpios", }, .kobj = { .name = ZPIOS_NAME, },
}; };
static int __init static int __init
@ -1247,7 +1248,7 @@ zpios_init(void)
int rc; int rc;
dev = MKDEV(ZPIOS_MAJOR, 0); dev = MKDEV(ZPIOS_MAJOR, 0);
if ((rc = register_chrdev_region(dev, ZPIOS_MINORS, "zpios"))) if ((rc = register_chrdev_region(dev, ZPIOS_MINORS, ZPIOS_NAME)))
goto error; goto error;
/* Support for registering a character driver */ /* Support for registering a character driver */
@ -1260,7 +1261,7 @@ zpios_init(void)
} }
/* Support for udev make driver info available in sysfs */ /* Support for udev make driver info available in sysfs */
zpios_class = class_create(THIS_MODULE, "zpios"); zpios_class = spl_class_create(THIS_MODULE, ZPIOS_NAME);
if (IS_ERR(zpios_class)) { if (IS_ERR(zpios_class)) {
rc = PTR_ERR(zpios_class); rc = PTR_ERR(zpios_class);
printk(KERN_ERR "ZPIOS: Error creating zpios class, %d\n", rc); printk(KERN_ERR "ZPIOS: Error creating zpios class, %d\n", rc);
@ -1269,7 +1270,8 @@ zpios_init(void)
goto error; goto error;
} }
spl_device_create(zpios_class, NULL, dev, NULL, "zpios"); zpios_device = spl_device_create(zpios_class, NULL,
dev, NULL, ZPIOS_NAME);
return 0; return 0;
error: error:
printk(KERN_ERR "ZPIOS: Error registering zpios device, %d\n", rc); printk(KERN_ERR "ZPIOS: Error registering zpios device, %d\n", rc);
@ -1281,9 +1283,8 @@ zpios_fini(void)
{ {
dev_t dev = MKDEV(ZPIOS_MAJOR, 0); dev_t dev = MKDEV(ZPIOS_MAJOR, 0);
spl_device_destroy(zpios_class, NULL, dev); spl_device_destroy(zpios_class, zpios_device, dev);
class_destroy(zpios_class); spl_class_destroy(zpios_class);
cdev_del(&zpios_cdev); cdev_del(&zpios_cdev);
unregister_chrdev_region(dev, ZPIOS_MINORS); unregister_chrdev_region(dev, ZPIOS_MINORS);