vserver 2.0 rc7

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

diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 01b4e9a..07bbd24 100644 (file)
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -56,7 +56,6 @@ static const char *mcdx_c_version
     = "$Id: mcdx.c,v 1.21 1997/01/26 07:12:59 davem Exp $";
 #endif
 
-#include <linux/version.h>
 #include <linux/module.h>
 
 #include <linux/errno.h>
@@ -77,8 +76,6 @@ static const char *mcdx_c_version
 #include <linux/blkdev.h>
 #include <linux/devfs_fs_kernel.h>
 
-/* for compatible parameter passing with "insmod" */
-#define        mcdx_drive_map mcdx
 #include "mcdx.h"
 
 #ifndef HZ
@@ -110,20 +107,20 @@ static const char *mcdx_c_version
    The _direct_ size is the number of sectors we're allowed to skip
    directly (performing a read instead of requesting the new sector
    needed */
-const int REQUEST_SIZE = 800;  /* should be less then 255 * 4 */
-const int DIRECT_SIZE = 400;   /* should be less then REQUEST_SIZE */
+static const int REQUEST_SIZE = 800;   /* should be less then 255 * 4 */
+static const int DIRECT_SIZE = 400;    /* should be less then REQUEST_SIZE */
 
 enum drivemodes { TOC, DATA, RAW, COOKED };
 enum datamodes { MODE0, MODE1, MODE2 };
 enum resetmodes { SOFT, HARD };
 
-const int SINGLE = 0x01;       /* single speed drive (FX001S, LU) */
-const int DOUBLE = 0x02;       /* double speed drive (FX001D, ..? */
-const int DOOR = 0x04;         /* door locking capability */
-const int MULTI = 0x08;                /* multi session capability */
+static const int SINGLE = 0x01;                /* single speed drive (FX001S, LU) */
+static const int DOUBLE = 0x02;                /* double speed drive (FX001D, ..? */
+static const int DOOR = 0x04;          /* door locking capability */
+static const int MULTI = 0x08;         /* multi session capability */
 
-const unsigned char READ1X = 0xc0;
-const unsigned char READ2X = 0xc1;
+static const unsigned char READ1X = 0xc0;
+static const unsigned char READ2X = 0xc1;
 
 
 /* DECLARATIONS ****************************************************/
@@ -213,9 +210,7 @@ struct s_drive_stuff {
        repeated here to show what's going on.  And to sense, if they're
        changed elsewhere. */
 
-/* declared in blk.h */
-int mcdx_init(void);
-void do_mcdx_request(request_queue_t * q);
+static int mcdx_init(void);
 
 static int mcdx_block_open(struct inode *inode, struct file *file)
 {
@@ -307,9 +302,16 @@ static int mcdx_setattentuator(struct s_drive_stuff *,
 
 static int mcdx_drive_map[][2] = MCDX_DRIVEMAP;
 static struct s_drive_stuff *mcdx_stuffp[MCDX_NDRIVES];
-static spinlock_t mcdx_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(mcdx_lock);
 static struct request_queue *mcdx_queue;
-MODULE_PARM(mcdx, "1-4i");
+
+/* You can only set the first two pairs, from old MODULE_PARM code.  */
+static int mcdx_set(const char *val, struct kernel_param *kp)
+{
+       get_options((char *)val, 4, (int *)mcdx_drive_map);
+       return 0;
+}
+module_param_call(mcdx, mcdx_set, NULL, NULL, 0);
 
 static struct cdrom_device_ops mcdx_dops = {
        .open           = mcdx_open,
@@ -565,7 +567,7 @@ static int mcdx_audio_ioctl(struct cdrom_device_info *cdi,
        }
 }
 
-void do_mcdx_request(request_queue_t * q)
+static void do_mcdx_request(request_queue_t * q)
 {
        struct s_drive_stuff *stuffp;
        struct request *req;
@@ -1024,7 +1026,7 @@ int __mcdx_init(void)
        return 0;
 }
 
-void __exit mcdx_exit(void)
+static void __exit mcdx_exit(void)
 {
        int i;
 
@@ -1071,7 +1073,7 @@ module_exit(mcdx_exit);
 
 /* Support functions ************************************************/
 
-int __init mcdx_init_drive(int drive)
+static int __init mcdx_init_drive(int drive)
 {
        struct s_version version;
        struct gendisk *disk;
@@ -1257,14 +1259,10 @@ int __init mcdx_init_drive(int drive)
        return 0;
 }
 
-int __init mcdx_init(void)
+static int __init mcdx_init(void)
 {
        int drive;
-#ifdef MODULE
-       xwarn("Version 2.14(hs) for " UTS_RELEASE "\n");
-#else
        xwarn("Version 2.14(hs) \n");
-#endif
 
        xwarn("$Id: mcdx.c,v 1.21 1997/01/26 07:12:59 davem Exp $\n");