diff options
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/gdth.c | 24 | ||||
| -rw-r--r-- | drivers/scsi/gdth.h | 41 |
2 files changed, 12 insertions, 53 deletions
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index cc0cb246b1e..a9eaab9fbd5 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -4034,7 +4034,7 @@ static void gdth_log_event(gdth_evt_data *dvr, char *buffer) } #ifdef GDTH_STATISTICS -void gdth_timeout(ulong data) +static void gdth_timeout(ulong data) { ulong32 i; Scsi_Cmnd *nscp; @@ -4062,7 +4062,7 @@ void gdth_timeout(ulong data) } #endif -void __init internal_setup(char *str,int *ints) +static void __init internal_setup(char *str,int *ints) { int i, argc; char *cur_str, *argv; @@ -4153,7 +4153,7 @@ int __init option_setup(char *str) return 1; } -int __init gdth_detect(Scsi_Host_Template *shtp) +static int __init gdth_detect(Scsi_Host_Template *shtp) { struct Scsi_Host *shp; gdth_pci_str pcistr[MAXHA]; @@ -4604,7 +4604,7 @@ int __init gdth_detect(Scsi_Host_Template *shtp) } -int gdth_release(struct Scsi_Host *shp) +static int gdth_release(struct Scsi_Host *shp) { int hanum; gdth_ha_str *ha; @@ -4691,7 +4691,7 @@ static const char *gdth_ctr_name(int hanum) return(""); } -const char *gdth_info(struct Scsi_Host *shp) +static const char *gdth_info(struct Scsi_Host *shp) { int hanum; gdth_ha_str *ha; @@ -4704,19 +4704,19 @@ const char *gdth_info(struct Scsi_Host *shp) } /* new error handling */ -int gdth_eh_abort(Scsi_Cmnd *scp) +static int gdth_eh_abort(Scsi_Cmnd *scp) { TRACE2(("gdth_eh_abort()\n")); return FAILED; } -int gdth_eh_device_reset(Scsi_Cmnd *scp) +static int gdth_eh_device_reset(Scsi_Cmnd *scp) { TRACE2(("gdth_eh_device_reset()\n")); return FAILED; } -int gdth_eh_bus_reset(Scsi_Cmnd *scp) +static int gdth_eh_bus_reset(Scsi_Cmnd *scp) { int i, hanum; gdth_ha_str *ha; @@ -4770,7 +4770,7 @@ int gdth_eh_bus_reset(Scsi_Cmnd *scp) return SUCCESS; } -int gdth_eh_host_reset(Scsi_Cmnd *scp) +static int gdth_eh_host_reset(Scsi_Cmnd *scp) { TRACE2(("gdth_eh_host_reset()\n")); return FAILED; @@ -4778,9 +4778,9 @@ int gdth_eh_host_reset(Scsi_Cmnd *scp) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip) +static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip) #else -int gdth_bios_param(Disk *disk,kdev_t dev,int *ip) +static int gdth_bios_param(Disk *disk,kdev_t dev,int *ip) #endif { unchar b, t; @@ -4818,7 +4818,7 @@ int gdth_bios_param(Disk *disk,kdev_t dev,int *ip) } -int gdth_queuecommand(Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *)) +static int gdth_queuecommand(Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *)) { int hanum; int priority; diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h index bf269f05ea8..c0f1e341152 100644 --- a/drivers/scsi/gdth.h +++ b/drivers/scsi/gdth.h @@ -1029,51 +1029,10 @@ typedef struct { /* function prototyping */ -int gdth_detect(Scsi_Host_Template *); -int gdth_release(struct Scsi_Host *); -int gdth_queuecommand(Scsi_Cmnd *,void (*done)(Scsi_Cmnd *)); -const char *gdth_info(struct Scsi_Host *); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -int gdth_bios_param(struct scsi_device *,struct block_device *,sector_t,int *); int gdth_proc_info(struct Scsi_Host *, char *,char **,off_t,int,int); -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) -int gdth_bios_param(Disk *,kdev_t,int *); -int gdth_proc_info(char *,char **,off_t,int,int,int); #else -int gdth_bios_param(Disk *,kdev_t,int *); -extern struct proc_dir_entry proc_scsi_gdth; int gdth_proc_info(char *,char **,off_t,int,int,int); -int gdth_abort(Scsi_Cmnd *); -int gdth_reset(Scsi_Cmnd *,unsigned int); -#define GDTH { proc_dir: &proc_scsi_gdth, \ - proc_info: gdth_proc_info, \ - name: "GDT SCSI Disk Array Controller",\ - detect: gdth_detect, \ - release: gdth_release, \ - info: gdth_info, \ - command: NULL, \ - queuecommand: gdth_queuecommand, \ - eh_abort_handler: gdth_eh_abort, \ - eh_device_reset_handler: gdth_eh_device_reset, \ - eh_bus_reset_handler: gdth_eh_bus_reset, \ - eh_host_reset_handler: gdth_eh_host_reset, \ - abort: gdth_abort, \ - reset: gdth_reset, \ - bios_param: gdth_bios_param, \ - can_queue: GDTH_MAXCMDS, \ - this_id: -1, \ - sg_tablesize: GDTH_MAXSG, \ - cmd_per_lun: GDTH_MAXC_P_L, \ - present: 0, \ - unchecked_isa_dma: 1, \ - use_clustering: ENABLE_CLUSTERING, \ - use_new_eh_code: 1 /* use new error code */ } #endif -int gdth_eh_abort(Scsi_Cmnd *scp); -int gdth_eh_device_reset(Scsi_Cmnd *scp); -int gdth_eh_bus_reset(Scsi_Cmnd *scp); -int gdth_eh_host_reset(Scsi_Cmnd *scp); - #endif |