patch-2.4.0-test9 linux/drivers/acorn/scsi/fas216.c

• Lines: 40
• Date: Mon Sep 18 15:15:22 2000
• Orig file: v2.4.0-test8/linux/drivers/acorn/scsi/fas216.c
• Orig date: Wed Aug 9 14:11:11 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/acorn/scsi/fas216.c linux/drivers/acorn/scsi/fas216.c
@@ -1,7 +1,11 @@
 /*
- * linux/arch/arm/drivers/scsi/fas216.c
+ *  linux/arch/arm/drivers/scsi/fas216.c
  *
- * Copyright (C) 1997-2000 Russell King
+ *  Copyright (C) 1997-2000 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * Based on information in qlogicfas.c by Tom Zerucha, Michael Griffith, and
  * other sources, including:
@@ -33,7 +37,6 @@
  * Todo:
  *  - allow individual devices to enable sync xfers.
  */
-
 #include <linux/module.h>
 #include <linux/blk.h>
 #include <linux/kernel.h>
@@ -2177,7 +2180,7 @@
 {
 	enum res_abort res = res_failed;
 
-	if (queue_removecmd(&info->queues.issue, SCpnt)) {
+	if (queue_remove_cmd(&info->queues.issue, SCpnt)) {
 		/*
 		 * The command was on the issue queue, and has not been
 		 * issued yet.  We can remove the command from the queue,
@@ -2187,7 +2190,7 @@
 		printk("on issue queue ");
 
 		res = res_success;
-	} else if (queue_removecmd(&info->queues.disconnected, SCpnt)) {
+	} else if (queue_remove_cmd(&info->queues.disconnected, SCpnt)) {
 		/*
 		 * The command was on the disconnected queue.  We must
 		 * reconnect with the device if possible, and send it