From f7398bc885b070927c1a4092e42c12dd33676aec Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 20 Feb 2003 21:18:37 -0600 Subject: [PATCH] [PATCH] wd7000 updates Move the host template to the actual source file and get rid of wd7000.h --- drivers/scsi/wd7000.c | 47 ++++++++++++++++++++++++++----- drivers/scsi/wd7000.h | 64 ------------------------------------------- 2 files changed, 40 insertions(+), 71 deletions(-) delete mode 100644 drivers/scsi/wd7000.h diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c index 8a092f5026de3..27a9beb9c12af 100644 --- a/drivers/scsi/wd7000.c +++ b/drivers/scsi/wd7000.c @@ -158,6 +158,11 @@ * Clean up delay to udelay, and yielding sleeps * Make host reset actually reset the card * Make everything static + * + * 2003/02/12 - Christoph Hellwig + * + * Cleaned up host template defintion + * Removed now obsolete wd7000.h */ #include @@ -170,8 +175,8 @@ #include #include #include -#include #include +#include #include #include @@ -179,9 +184,9 @@ #include "scsi.h" #include "hosts.h" - #include + #define ANY2SCSI_INLINE /* undef this to use old macros */ #undef WD7000_DEBUG /* general debug */ #ifdef WD7000_DEBUG @@ -190,9 +195,6 @@ #define dprintk(format,args...) #endif -#include "wd7000.h" -#include - /* * Mailbox structure sizes. * I prefer to keep the number of ICMBs much larger than the number of @@ -211,6 +213,21 @@ */ #define MAX_SCBS 32 +/* + * In this version, sg_tablesize now defaults to WD7000_SG, and will + * be set to SG_NONE for older boards. This is the reverse of the + * previous default, and was changed so that the driver-level + * Scsi_Host_Template would reflect the driver's support for scatter/ + * gather. + * + * Also, it has been reported that boards at Revision 6 support scatter/ + * gather, so the new definition of an "older" board has been changed + * accordingly. + */ +#define WD7000_Q 16 +#define WD7000_SG 16 + + /* * WD7000-specific mailbox structure * @@ -1737,7 +1754,23 @@ MODULE_AUTHOR("Thomas Wuensche, John Boyd, Miroslav Zagorac"); MODULE_DESCRIPTION("Driver for the WD7000 series ISA controllers"); MODULE_LICENSE("GPL"); -/* Eventually this will go into an include file, but this will be later */ -static Scsi_Host_Template driver_template = WD7000; +static Scsi_Host_Template driver_template = { + .proc_name = "wd7000", + .proc_info = wd7000_proc_info, + .name = "Western Digital WD-7000", + .detect = wd7000_detect, + .command = wd7000_command, + .queuecommand = wd7000_queuecommand, + .eh_bus_reset_handler = wd7000_bus_reset, + .eh_device_reset_handler = wd7000_device_reset, + .eh_host_reset_handler = wd7000_host_reset, + .bios_param = wd7000_biosparam, + .can_queue = WD7000_Q, + .this_id = 7, + .sg_tablesize = WD7000_SG, + .cmd_per_lun = 1, + .unchecked_isa_dma = 1, + .use_clustering = ENABLE_CLUSTERING, +}; #include "scsi_module.c" diff --git a/drivers/scsi/wd7000.h b/drivers/scsi/wd7000.h deleted file mode 100644 index 2af6a9f689a5b..0000000000000 --- a/drivers/scsi/wd7000.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef _WD7000_H - -/* $Id: $ - * - * Header file for the WD-7000 driver for Linux - * - * John Boyd Jan 1994: - * This file has been reduced to only the definitions needed for the - * WD7000 host structure. - * - * Revision by Miroslav Zagorac Jun 1997. - */ - -#include - -static int wd7000_set_info(char *buffer, int length, struct Scsi_Host *host); -static int wd7000_proc_info(char *buffer, char **start, off_t offset, int length, int hostno, int inout); -static int wd7000_detect(Scsi_Host_Template *); -static int wd7000_command(Scsi_Cmnd *); -static int wd7000_queuecommand(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); -static int wd7000_abort(Scsi_Cmnd *); -static int wd7000_bus_reset(Scsi_Cmnd *); -static int wd7000_host_reset(Scsi_Cmnd *); -static int wd7000_device_reset(Scsi_Cmnd *); -static int wd7000_biosparam(struct scsi_device *, struct block_device *, - sector_t, int *); - -#ifndef NULL -#define NULL 0L -#endif - -/* - * In this version, sg_tablesize now defaults to WD7000_SG, and will - * be set to SG_NONE for older boards. This is the reverse of the - * previous default, and was changed so that the driver-level - * Scsi_Host_Template would reflect the driver's support for scatter/ - * gather. - * - * Also, it has been reported that boards at Revision 6 support scatter/ - * gather, so the new definition of an "older" board has been changed - * accordingly. - */ -#define WD7000_Q 16 -#define WD7000_SG 16 - -#define WD7000 { \ - .proc_name = "wd7000", \ - .proc_info = wd7000_proc_info, \ - .name = "Western Digital WD-7000", \ - .detect = wd7000_detect, \ - .command = wd7000_command, \ - .queuecommand = wd7000_queuecommand, \ - .eh_bus_reset_handler = wd7000_bus_reset, \ - .eh_device_reset_handler = wd7000_device_reset, \ - .eh_host_reset_handler = wd7000_host_reset, \ - .bios_param = wd7000_biosparam, \ - .can_queue = WD7000_Q, \ - .this_id = 7, \ - .sg_tablesize = WD7000_SG, \ - .cmd_per_lun = 1, \ - .unchecked_isa_dma = 1, \ - .use_clustering = ENABLE_CLUSTERING, \ -} -#endif -- 2.53.0