block: kill request_queue_t

[linux-2.6-omap-h63xx.git] / drivers / cdrom / viocd.c

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index cac06bc1754b327f7e88605c4f1ed838d8187966..9d0dfe6e0d63ac7829473ec32afbd58fbc478d72 100644 (file)
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -6,7 +6,7 @@
  *  Authors: Dave Boutcher <boutcher@us.ibm.com>
  *           Ryan Arnold <ryanarn@us.ibm.com>
  *           Colin Devilbiss <devilbis@us.ibm.com>
- *           Stephen Rothwell <sfr@au1.ibm.com>
+ *           Stephen Rothwell
  *
  * (C) Copyright 2000-2004 IBM Corporation
  *
@@ -144,6 +144,7 @@ static int proc_viocd_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations proc_viocd_operations = {
+       .owner          = THIS_MODULE,
        .open           = proc_viocd_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
@@ -650,10 +651,7 @@ static int viocd_remove(struct vio_dev *vdev)
 {
        struct disk_info *d = &viocd_diskinfo[vdev->unit_address];
 
-       if (unregister_cdrom(&d->viocd_info) != 0)
-               printk(VIOCD_KERN_WARNING
-                               "Cannot unregister viocd CD-ROM %s!\n",
-                               d->viocd_info.name);
+       unregister_cdrom(&d->viocd_info);
        del_gendisk(d->viocd_disk);
        blk_cleanup_queue(d->viocd_disk->queue);
        put_disk(d->viocd_disk);
@@ -682,7 +680,6 @@ static struct vio_driver viocd_driver = {
 
 static int __init viocd_init(void)
 {
-       struct proc_dir_entry *e;
        int ret = 0;
 
        if (!firmware_has_feature(FW_FEATURE_ISERIES))
@@ -722,12 +719,8 @@ static int __init viocd_init(void)
        if (ret)
                goto out_free_info;
 
-       e = create_proc_entry("iSeries/viocd", S_IFREG|S_IRUGO, NULL);
-       if (e) {
-               e->owner = THIS_MODULE;
-               e->proc_fops = &proc_viocd_operations;
-       }
-
+       proc_create("iSeries/viocd", S_IFREG|S_IRUGO, NULL,
+                   &proc_viocd_operations);
        return 0;
 
 out_free_info: