2 files changed, 3 insertions, 8 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index ac3829030ac5..69f26eb6415b 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2194,7 +2194,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 if (ret)
                         break;
 
-                memset(rq->cmd, 0, sizeof(rq->cmd));
                 rq->cmd[0] = GPCMD_READ_CD;
                 rq->cmd[1] = 1 << 2;
                 rq->cmd[2] = (lba >> 24) & 0xff;
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index b74b6c2768a8..5245a4a0ba74 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -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,
@@ -679,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))
@@ -719,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: