fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / cdrom / gscd.c

diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index a89cc98..fa70824 100644 (file)
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -70,7 +70,6 @@
 
 #define MAJOR_NR GOLDSTAR_CDROM_MAJOR
 #include <linux/blkdev.h>
-#define gscd_port gscd         /* for compatible parameter passing with "insmod" */
 #include "gscd.h"
 
 static int gscdPresent = 0;
@@ -78,7 +77,7 @@ static int gscdPresent = 0;
 static unsigned char gscd_buf[2048];   /* buffer for block size conversion */
 static int gscd_bn = -1;
 static short gscd_port = GSCD_BASE_ADDR;
-MODULE_PARM(gscd, "h");
+module_param_named(gscd, gscd_port, short, 0);
 
 /* Kommt spaeter vielleicht noch mal dran ...
  *    static DECLARE_WAIT_QUEUE_HEAD(gscd_waitq);
@@ -147,8 +146,8 @@ static int AudioStart_f;
 static int AudioEnd_m;
 static int AudioEnd_f;
 
-static struct timer_list gscd_timer = TIMER_INITIALIZER(NULL, 0, 0);
-static spinlock_t gscd_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_TIMER(gscd_timer, NULL, 0, 0);
+static DEFINE_SPINLOCK(gscd_lock);
 static struct request_queue *gscd_queue;
 
 static struct block_device_operations gscd_fops = {
@@ -267,7 +266,7 @@ repeat:
                goto out;
 
        if (req->cmd != READ) {
-               printk("GSCD: bad cmd %lu\n", rq_data_dir(req));
+               printk("GSCD: bad cmd %u\n", rq_data_dir(req));
                end_request(req, 0);
                goto repeat;
        }
@@ -956,7 +955,6 @@ static int __init gscd_init(void)
        gscd_disk->first_minor = 0;
        gscd_disk->fops = &gscd_fops;
        sprintf(gscd_disk->disk_name, "gscd");
-       sprintf(gscd_disk->devfs_name, "gscd");
 
        if (register_blkdev(MAJOR_NR, "gscd")) {
                ret = -EIO;