linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ths@linux-mips.org
Date: Tue, 12 Apr 2005 15:00:45 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/04/12 15:00:38

Modified files:
        drivers/scsi   : sgiwd93.c 
Removed files:
        drivers/scsi   : sgiwd93.h 

Log message:
        Enable proc support, minor code cleanup.

diff -urN linux/drivers/scsi/sgiwd93.c linux/drivers/scsi/sgiwd93.c
--- linux/drivers/scsi/sgiwd93.c        2004/06/26 15:15:18     1.51
+++ linux/drivers/scsi/sgiwd93.c        2005/04/12 14:00:38     1.52
@@ -33,7 +33,6 @@
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include "wd33c93.h"
-#include "sgiwd93.h"
 
 #include <linux/stat.h>
 
@@ -320,7 +319,6 @@
  * on 64-bit systems with memory outside the compat address spaces.
  */
 static Scsi_Host_Template driver_template = {
-       .proc_name              = "SGIWD93",
        .name                   = "SGI WD93",
        .detect                 = sgiwd93_detect,
        .release                = sgiwd93_release,
@@ -328,10 +326,12 @@
        .eh_abort_handler       = wd33c93_abort,
        .eh_bus_reset_handler   = sgiwd93_bus_reset,
        .eh_host_reset_handler  = wd33c93_host_reset,
-       .can_queue              = CAN_QUEUE,
+       .proc_info              = wd33c93_proc_info,
+       .proc_name              = "SGIWD93",
+       .can_queue              = 16,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,
-       .cmd_per_lun            = CMD_PER_LUN,
+       .cmd_per_lun            = 8,
        .use_clustering         = DISABLE_CLUSTERING,
 };
 #include "scsi_module.c"
diff -urN linux/drivers/scsi/sgiwd93.h linux/drivers/scsi/sgiwd93.h
--- linux/drivers/scsi/Attic/sgiwd93.h  2005-04-12 15:00:38.661662000 +0100     
1.10
+++ linux/drivers/scsi/Attic/sgiwd93.h  1970/01/01 00:00:00+0100
@@ -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) */

<Prev in Thread] Current Thread [Next in Thread>