浏览代码

[SCSI] sgiwd93: small fixes

Move the remaining bits of sgiwd93.h into sgiwd93.c; replace the use of
CMD_PER_LUN and CAN_QUEUE by raw numbers.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Ralf Baechle 19 年之前
父节点
当前提交
d25cf1ced9
共有 2 个文件被更改,包括 2 次插入27 次删除
  1. 2 3
      drivers/scsi/sgiwd93.c
  2. 0 24
      drivers/scsi/sgiwd93.h

+ 2 - 3
drivers/scsi/sgiwd93.c

@@ -33,7 +33,6 @@
 #include "scsi.h"
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "wd33c93.h"
-#include "sgiwd93.h"
 
 
 #include <linux/stat.h>
 #include <linux/stat.h>
 
 
@@ -335,10 +334,10 @@ static Scsi_Host_Template driver_template = {
 	.eh_abort_handler	= wd33c93_abort,
 	.eh_abort_handler	= wd33c93_abort,
 	.eh_bus_reset_handler	= sgiwd93_bus_reset,
 	.eh_bus_reset_handler	= sgiwd93_bus_reset,
 	.eh_host_reset_handler	= wd33c93_host_reset,
 	.eh_host_reset_handler	= wd33c93_host_reset,
-	.can_queue		= CAN_QUEUE,
+	.can_queue		= 16,
 	.this_id		= 7,
 	.this_id		= 7,
 	.sg_tablesize		= SG_ALL,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= CMD_PER_LUN,
+	.cmd_per_lun		= 8,
 	.use_clustering		= DISABLE_CLUSTERING,
 	.use_clustering		= DISABLE_CLUSTERING,
 };
 };
 #include "scsi_module.c"
 #include "scsi_module.c"

+ 0 - 24
drivers/scsi/sgiwd93.h

@@ -1,24 +0,0 @@
-/* $Id: sgiwd93.h,v 1.5 1998/08/25 09:18:50 ralf Exp $
- * sgiwd93.h: SGI WD93 scsi definitions.
- *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- */
-#ifndef _SGIWD93_H
-#define _SGIWD93_H
-
-#ifndef CMD_PER_LUN
-#define CMD_PER_LUN 8
-#endif
-
-#ifndef CAN_QUEUE
-#define CAN_QUEUE   16
-#endif
-
-int sgiwd93_detect(Scsi_Host_Template *);
-int sgiwd93_release(struct Scsi_Host *instance);
-const char *wd33c93_info(void);
-int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-int wd33c93_abort(Scsi_Cmnd *);
-int wd33c93_host_reset(Scsi_Cmnd * SCpnt);
-
-#endif /* !(_SGIWD93_H) */