vserver 1.9.3

[linux-2.6.git] / drivers / scsi / aic7xxx / aic7xxx_osm.c

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 3c7a485..ecbc05d 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -140,6 +140,7 @@
 
 #include <linux/mm.h>          /* For fetching system memory size */
 #include <linux/blkdev.h>              /* For block_size() */
+#include <linux/delay.h>       /* For ssleep/msleep */
 
 /*
  * Lock protecting manipulation of the ahc softc list.
@@ -436,7 +437,6 @@ uint32_t aic7xxx_periodic_otag;
 /*
  * Module information and settable options.
  */
-#ifdef MODULE
 static char *aic7xxx = NULL;
 /*
  * Just in case someone uses commas to separate items on the insmod
@@ -447,9 +447,8 @@ static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n";
 
 MODULE_AUTHOR("Maintainer: Justin T. Gibbs <gibbs@scsiguy.com>");
 MODULE_DESCRIPTION("Adaptec Aic77XX/78XX SCSI Host Bus Adapter driver");
-#ifdef MODULE_LICENSE
 MODULE_LICENSE("Dual BSD/GPL");
-#endif
+MODULE_VERSION(AIC7XXX_DRIVER_VERSION);
 MODULE_PARM(aic7xxx, "s");
 MODULE_PARM_DESC(aic7xxx,
 "period delimited, options string.\n"
@@ -479,7 +478,6 @@ MODULE_PARM_DESC(aic7xxx,
 "\n"
 "      options aic7xxx 'aic7xxx=probe_eisa_vl.tag_info:{{}.{.10}}.seltime:1'\n"
 );
-#endif
 
 static void ahc_linux_handle_scsi_status(struct ahc_softc *,
                                         struct ahc_linux_device *,
@@ -2825,7 +2823,7 @@ ahc_linux_dv_transition(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
                                break;
                        }
                        if (status & SSQ_DELAY)
-                               scsi_sleep(1 * HZ);
+                               ssleep(1);
 
                        break;
                case SS_START:
@@ -2985,7 +2983,7 @@ ahc_linux_dv_transition(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
                        }
                        if (targ->dv_state_retry <= 10) {
                                if ((status & (SSQ_DELAY_RANDOM|SSQ_DELAY))!= 0)
-                                       scsi_sleep(ahc->our_id*HZ/10);
+                                       msleep(ahc->our_id*1000/10);
                                break;
                        }
 #ifdef AHC_DEBUG
@@ -3029,7 +3027,7 @@ ahc_linux_dv_transition(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
                                targ->dv_state_retry--;
                        } else if (targ->dv_state_retry < 60) {
                                if ((status & SSQ_DELAY) != 0)
-                                       scsi_sleep(1 * HZ);
+                                       ssleep(1);
                        } else {
 #ifdef AHC_DEBUG
                                if (ahc_debug & AHC_SHOW_DV) {