fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index b6a14c8..ec46949 100644 (file)
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -165,7 +165,6 @@
                         Torben Mathiasen <tmm@image.dk>
 */
 
-#include <linux/version.h>
 #include <linux/blkdev.h>
 #include "aztcd.h"
 
@@ -288,7 +287,7 @@ static volatile int azt_read_count = 1;
 
 static int azt_port = AZT_BASE_ADDR;
 
-MODULE_PARM(azt_port, "i");
+module_param(azt_port, int, 0);
 
 static int azt_port_auto[16] = AZT_BASE_AUTO;
 
@@ -298,7 +297,7 @@ static char azt_auto_eject = AZT_AUTO_EJECT;
 
 static int AztTimeout, AztTries;
 static DECLARE_WAIT_QUEUE_HEAD(azt_waitq);
-static struct timer_list delay_timer = TIMER_INITIALIZER(NULL, 0, 0);
+static DEFINE_TIMER(delay_timer, NULL, 0, 0);
 
 static struct azt_DiskInfo DiskInfo;
 static struct azt_Toc Toc[MAX_TRACKS];
@@ -312,7 +311,7 @@ static unsigned char aztIndatum;
 static unsigned long aztTimeOutCount;
 static int aztCmd = 0;
 
-static spinlock_t aztSpin = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(aztSpin);
 
 /*###########################################################################
    Function Prototypes
@@ -1708,8 +1707,8 @@ static int __init aztcd_init(void)
        printk(KERN_INFO "aztcd: (C) 1994-98 W.Zimmermann\n");
        if (azt_port == -1) {
                printk
-                   ("aztcd: KernelVersion=%s DriverVersion=%s For IDE/ATAPI-drives use ide-cd.c\n",
-                    UTS_RELEASE, AZT_VERSION);
+                   ("aztcd: DriverVersion=%s For IDE/ATAPI-drives use ide-cd.c\n",
+                    AZT_VERSION);
        } else
                printk
                    ("aztcd: DriverVersion=%s BaseAddress=0x%x  For IDE/ATAPI-drives use ide-cd.c\n",
@@ -1764,7 +1763,7 @@ static int __init aztcd_init(void)
                                release_region(azt_port, 4);
                        }
                }
-               if ((azt_port_auto[i] == 0) || (i == 16)) {
+               if ((i == 16) || (azt_port_auto[i] == 0)) {
                        printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n");
                        return -EIO;
                }
@@ -1919,7 +1918,6 @@ static int __init aztcd_init(void)
        azt_disk->first_minor = 0;
        azt_disk->fops = &azt_fops;
        sprintf(azt_disk->disk_name, "aztcd");
-       sprintf(azt_disk->devfs_name, "aztcd");
        azt_disk->queue = azt_queue;
        add_disk(azt_disk);
        azt_invalidate_buffers();