lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] convert scsi changer driver from class simple

Browse Source 
Here is a incremental patch which switches the driver over to
the new non-simple functions.  Compile-tested.

Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Gerd Knorr
2005-05-12 10:25:26 +02:00
committed by James Bottomley
parent daa6eda65a
commit 21feb5ccd5
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/scsi/ch.c
View File

@@ -101,7 +101,7 @@ static long ch_ioctl_compat(struct file * filp,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
#endif #endif
static struct class_simple * ch_sysfs_class; static struct class * ch_sysfs_class;
typedef struct { typedef struct {
struct list_head list; struct list_head list;
@@ -942,7 +942,7 @@ static int ch_probe(struct device *dev)
devfs_mk_cdev(MKDEV(SCSI_CHANGER_MAJOR,ch->minor), devfs_mk_cdev(MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
S_IFCHR | S_IRUGO | S_IWUGO, ch->name); S_IFCHR | S_IRUGO | S_IWUGO, ch->name);
class_simple_device_add(ch_sysfs_class, class_device_create(ch_sysfs_class,
MKDEV(SCSI_CHANGER_MAJOR,ch->minor), MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
dev, "s%s", ch->name); dev, "s%s", ch->name);
@@ -972,7 +972,8 @@ static int ch_remove(struct device *dev)
list_del(&ch->list); list_del(&ch->list);
spin_unlock(&ch_devlist_lock); spin_unlock(&ch_devlist_lock);
class_simple_device_remove(MKDEV(SCSI_CHANGER_MAJOR,ch->minor)); class_device_destroy(ch_sysfs_class,
MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
devfs_remove(ch->name); devfs_remove(ch->name);
kfree(ch->dt); kfree(ch->dt);
kfree(ch); kfree(ch);
@@ -985,7 +986,7 @@ static int __init init_ch_module(void)
int rc; int rc;
printk(KERN_INFO "SCSI Media Changer driver v" VERSION " \n"); printk(KERN_INFO "SCSI Media Changer driver v" VERSION " \n");
ch_sysfs_class = class_simple_create(THIS_MODULE, "scsi_changer"); ch_sysfs_class = class_create(THIS_MODULE, "scsi_changer");
if (IS_ERR(ch_sysfs_class)) { if (IS_ERR(ch_sysfs_class)) {
rc = PTR_ERR(ch_sysfs_class); rc = PTR_ERR(ch_sysfs_class);
return rc; return rc;
@@ -1004,7 +1005,7 @@ static int __init init_ch_module(void)
fail2: fail2:
unregister_chrdev(SCSI_CHANGER_MAJOR, "ch"); unregister_chrdev(SCSI_CHANGER_MAJOR, "ch");
fail1: fail1:
class_simple_destroy(ch_sysfs_class); class_destroy(ch_sysfs_class);
return rc; return rc;
} }
@@ -1012,7 +1013,7 @@ static void __exit exit_ch_module(void)
{ {
scsi_unregister_driver(&ch_template.gendrv); scsi_unregister_driver(&ch_template.gendrv);
unregister_chrdev(SCSI_CHANGER_MAJOR, "ch"); unregister_chrdev(SCSI_CHANGER_MAJOR, "ch");
class_simple_destroy(ch_sysfs_class); class_destroy(ch_sysfs_class);
} }
module_init(init_ch_module); module_init(init_ch_module);