[PATCH] remove scsi_queue.c

it has just one function nowdays, and that one would be much better
static in scsi.c

4 files changed, 87 insertions, 156 deletions

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index da327d8f30bb..d88c806426cb 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -120,8 +120,9 @@ obj-$(CONFIG_BLK_DEV_SR)	+= sr_mod.o
 obj-$(CONFIG_CHR_DEV_SG)	+= sg.o
 
 scsi_mod-objs	:= scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \
-			scsi_proc.o scsi_error.o scsi_queue.o scsi_lib.o \
-			scsi_merge.o scsi_scan.o scsi_syms.o
+			scsi_proc.o scsi_error.o scsi_lib.o scsi_merge.o \
+			scsi_scan.o scsi_syms.o
+			
 sd_mod-objs	:= sd.o
 sr_mod-objs	:= sr.o sr_ioctl.o sr_vendor.o
 initio-objs	:= ini9100u.o i91uscsi.o
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 2e591f846b9a..101a2b10fe2e 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -594,6 +594,90 @@ inline void __scsi_release_command(Scsi_Cmnd * SCpnt)
 }
 
 /*
+ * Function:    scsi_mlqueue_insert()
+ *
+ * Purpose:     Insert a command in the midlevel queue.
+ *
+ * Arguments:   cmd    - command that we are adding to queue.
+ *              reason - why we are inserting command to queue.
+ *
+ * Lock status: Assumed that lock is not held upon entry.
+ *
+ * Returns:     Nothing.
+ *
+ * Notes:       We do this for one of two cases.  Either the host is busy
+ *              and it cannot accept any more commands for the time being,
+ *              or the device returned QUEUE_FULL and can accept no more
+ *              commands.
+ * Notes:       This could be called either from an interrupt context or a
+ *              normal process context.
+ */
+static int scsi_mlqueue_insert(Scsi_Cmnd * cmd, int reason)
+{
+	struct Scsi_Host *host = cmd->host;
+	unsigned long flags;
+
+	SCSI_LOG_MLQUEUE(1,
+		 printk("Inserting command %p into mlqueue\n", cmd));
+
+	/*
+	 * We are inserting the command into the ml queue.  First, we
+	 * cancel the timer, so it doesn't time out.
+	 */
+	scsi_delete_timer(cmd);
+
+	/*
+	 * Next, set the appropriate busy bit for the device/host.
+	 *
+	 * If the host/device isn't busy, assume that something actually
+	 * completed, and that we should be able to queue a command now.
+	 *
+	 * Note that there is an implicit assumption that every host can
+	 * always queue at least one command.  If a host is inactive and
+	 * cannot queue any commands, I don't see how things could
+	 * possibly work anyways.
+	 */
+	if (reason == SCSI_MLQUEUE_HOST_BUSY) {
+		if (host->host_busy == 0) {
+			if (scsi_retry_command(cmd) == 0) {
+				return 0;
+			}
+		}
+		host->host_blocked = TRUE;
+	} else {
+		if (cmd->device->device_busy == 0) {
+			if (scsi_retry_command(cmd) == 0) {
+				return 0;
+			}
+		}
+		cmd->device->device_blocked = TRUE;
+	}
+
+	/*
+	 * Register the fact that we own the thing for now.
+	 */
+	cmd->state = SCSI_STATE_MLQUEUE;
+	cmd->owner = SCSI_OWNER_MIDLEVEL;
+	cmd->bh_next = NULL;
+
+	/*
+	 * Decrement the counters, since these commands are no longer
+	 * active on the host/device.
+	 */
+	spin_lock_irqsave(cmd->host->host_lock, flags);
+	cmd->host->host_busy--;
+	cmd->device->device_busy--;
+	spin_unlock_irqrestore(cmd->host->host_lock, flags);
+
+	/*
+	 * Insert this command at the head of the queue for it's device.
+	 * It will go before all other commands that are already in the queue.
+	 */
+	scsi_insert_special_cmd(cmd, 1);
+	return 0;
+}
+
+/*
  * Function:    scsi_release_command
  *
  * Purpose:     Release a command block.
diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h
index 1981e23e7ea4..d16f4933b178 100644
--- a/drivers/scsi/scsi.h
+++ b/drivers/scsi/scsi.h
@@ -461,11 +461,6 @@ extern void scsi_initialize_merge_fn(Scsi_Device *SDpnt);
 extern int scsi_init_io(Scsi_Cmnd *SCpnt);
 
 /*
- * Prototypes for functions in scsi_queue.c
- */
-extern int scsi_mlqueue_insert(Scsi_Cmnd * cmd, int reason);
-
-/*
  * Prototypes for functions in scsi_lib.c
  */
 extern int scsi_maybe_unblock_host(Scsi_Device * SDpnt);
diff --git a/drivers/scsi/scsi_queue.c b/drivers/scsi/scsi_queue.c
deleted file mode 100644
index 93f9491fd17d..000000000000
--- a/drivers/scsi/scsi_queue.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *  scsi_queue.c Copyright (C) 1997 Eric Youngdale
- *
- *  generic mid-level SCSI queueing.
- *
- *  The point of this is that we need to track when hosts are unable to
- *  accept a command because they are busy.  In addition, we track devices
- *  that cannot accept a command because of a QUEUE_FULL condition.  In both
- *  of these cases, we enter the command in the queue.  At some later point,
- *  we attempt to remove commands from the queue and retry them.
- */
-
-#include <linux/module.h>
-
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/ioport.h>
-#include <linux/kernel.h>
-#include <linux/stat.h>
-#include <linux/blk.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/smp_lock.h>
-
-#define __KERNEL_SYSCALLS__
-
-#include <linux/unistd.h>
-
-#include <asm/system.h>
-#include <asm/irq.h>
-#include <asm/dma.h>
-
-#include "scsi.h"
-#include "hosts.h"
-
-/*
- * TODO:
- *      1) Prevent multiple traversals of list to look for commands to
- *         queue.
- *      2) Protect against multiple insertions of list at the same time.
- * DONE:
- *      1) Set state of scsi command to a new state value for ml queue.
- *      2) Insert into queue when host rejects command.
- *      3) Make sure status code is properly passed from low-level queue func
- *         so that internal_cmnd properly returns the right value.
- *      4) Insert into queue when QUEUE_FULL.
- *      5) Cull queue in bottom half handler.
- *      6) Check usage count prior to queue insertion.  Requeue if usage
- *         count is 0.
- *      7) Don't send down any more commands if the host/device is busy.
- */
-
-static const char RCSid[] = "$Header: /mnt/ide/home/eric/CVSROOT/linux/drivers/scsi/scsi_queue.c,v 1.1 1997/10/21 11:16:38 eric Exp $";
-
-
-/*
- * Function:    scsi_mlqueue_insert()
- *
- * Purpose:     Insert a command in the midlevel queue.
- *
- * Arguments:   cmd    - command that we are adding to queue.
- *              reason - why we are inserting command to queue.
- *
- * Lock status: Assumed that lock is not held upon entry.
- *
- * Returns:     Nothing.
- *
- * Notes:       We do this for one of two cases.  Either the host is busy
- *              and it cannot accept any more commands for the time being,
- *              or the device returned QUEUE_FULL and can accept no more
- *              commands.
- * Notes:       This could be called either from an interrupt context or a
- *              normal process context.
- */
-int scsi_mlqueue_insert(Scsi_Cmnd * cmd, int reason)
-{
-	struct Scsi_Host *host;
-	unsigned long flags;
-
-	SCSI_LOG_MLQUEUE(1, printk("Inserting command %p into mlqueue\n", cmd));
-
-	/*
-	 * We are inserting the command into the ml queue.  First, we
-	 * cancel the timer, so it doesn't time out.
-	 */
-	scsi_delete_timer(cmd);
-
-	host = cmd->host;
-
-	/*
-	 * Next, set the appropriate busy bit for the device/host.
-	 */
-	if (reason == SCSI_MLQUEUE_HOST_BUSY) {
-		/*
-		 * Protect against race conditions.  If the host isn't busy,
-		 * assume that something actually completed, and that we should
-		 * be able to queue a command now.  Note that there is an implicit
-		 * assumption that every host can always queue at least one command.
-		 * If a host is inactive and cannot queue any commands, I don't see
-		 * how things could possibly work anyways.
-		 */
-		if (host->host_busy == 0) {
-			if (scsi_retry_command(cmd) == 0) {
-				return 0;
-			}
-		}
-		host->host_blocked = TRUE;
-	} else {
-		/*
-		 * Protect against race conditions.  If the device isn't busy,
-		 * assume that something actually completed, and that we should
-		 * be able to queue a command now.  Note that there is an implicit
-		 * assumption that every host can always queue at least one command.
-		 * If a host is inactive and cannot queue any commands, I don't see
-		 * how things could possibly work anyways.
-		 */
-		if (cmd->device->device_busy == 0) {
-			if (scsi_retry_command(cmd) == 0) {
-				return 0;
-			}
-		}
-		cmd->device->device_blocked = TRUE;
-	}
-
-	/*
-	 * Register the fact that we own the thing for now.
-	 */
-	cmd->state = SCSI_STATE_MLQUEUE;
-	cmd->owner = SCSI_OWNER_MIDLEVEL;
-	cmd->bh_next = NULL;
-
-	/*
-	 * Decrement the counters, since these commands are no longer
-	 * active on the host/device.
-	 */
-	spin_lock_irqsave(cmd->host->host_lock, flags);
-	cmd->host->host_busy--;
-	cmd->device->device_busy--;
-	spin_unlock_irqrestore(cmd->host->host_lock, flags);
-
-	/*
-	 * Insert this command at the head of the queue for it's device.
-	 * It will go before all other commands that are already in the queue.
-	 */
-	scsi_insert_special_cmd(cmd, 1);
-	return 0;
-}