Commit 6ea618a8 authored by Doug Ledford's avatar Doug Ledford

Compile fixes needed due to host struct change

parent c38ec0c8
...@@ -468,25 +468,14 @@ void tw_unmask_command_interrupt(TW_Device_Extension *tw_dev); ...@@ -468,25 +468,14 @@ void tw_unmask_command_interrupt(TW_Device_Extension *tw_dev);
/* Scsi_Host_Template Initializer */ /* Scsi_Host_Template Initializer */
#define TWXXXX { \ #define TWXXXX { \
next : NULL, \
module : NULL, \
proc_name : "3w-xxxx", \ proc_name : "3w-xxxx", \
proc_info : tw_scsi_proc_info, \ proc_info : tw_scsi_proc_info, \
name : "3ware Storage Controller", \ name : "3ware Storage Controller", \
detect : tw_scsi_detect, \ detect : tw_scsi_detect, \
release : tw_scsi_release, \ release : tw_scsi_release, \
info : NULL, \
ioctl : NULL, \
command : NULL, \
queuecommand : tw_scsi_queue, \ queuecommand : tw_scsi_queue, \
eh_strategy_handler : NULL, \
eh_abort_handler : tw_scsi_eh_abort, \ eh_abort_handler : tw_scsi_eh_abort, \
eh_device_reset_handler : NULL, \
eh_bus_reset_handler : NULL, \
eh_host_reset_handler : tw_scsi_eh_reset, \ eh_host_reset_handler : tw_scsi_eh_reset, \
abort : NULL, \
reset : NULL, \
slave_attach : NULL, \
bios_param : tw_scsi_biosparam, \ bios_param : tw_scsi_biosparam, \
can_queue : TW_Q_LENGTH-1, \ can_queue : TW_Q_LENGTH-1, \
this_id: -1, \ this_id: -1, \
......
...@@ -63,22 +63,14 @@ int ahc_linux_abort(Scsi_Cmnd *); ...@@ -63,22 +63,14 @@ int ahc_linux_abort(Scsi_Cmnd *);
* to do with card config are filled in after the card is detected. * to do with card config are filled in after the card is detected.
*/ */
#define AIC7XXX { \ #define AIC7XXX { \
module: NULL, \
proc_dir: NULL, \
proc_info: ahc_linux_proc_info, \ proc_info: ahc_linux_proc_info, \
name: NULL, \
detect: ahc_linux_detect, \ detect: ahc_linux_detect, \
release: ahc_linux_release, \ release: ahc_linux_release, \
info: ahc_linux_info, \ info: ahc_linux_info, \
command: NULL, \
queuecommand: ahc_linux_queue, \ queuecommand: ahc_linux_queue, \
eh_strategy_handler: NULL, \
eh_abort_handler: ahc_linux_abort, \ eh_abort_handler: ahc_linux_abort, \
eh_device_reset_handler: ahc_linux_dev_reset, \ eh_device_reset_handler: ahc_linux_dev_reset, \
eh_bus_reset_handler: ahc_linux_bus_reset, \ eh_bus_reset_handler: ahc_linux_bus_reset, \
eh_host_reset_handler: NULL, \
abort: NULL, \
reset: NULL, \
slave_attach: ahc_linux_slave_attach, \ slave_attach: ahc_linux_slave_attach, \
bios_param: AIC7XXX_BIOSPARAM, \ bios_param: AIC7XXX_BIOSPARAM, \
can_queue: 253, /* max simultaneous cmds */\ can_queue: 253, /* max simultaneous cmds */\
......
...@@ -37,18 +37,13 @@ extern const char *atp870u_info(struct Scsi_Host *); ...@@ -37,18 +37,13 @@ extern const char *atp870u_info(struct Scsi_Host *);
extern int atp870u_proc_info(char *, char **, off_t, int, int, int); extern int atp870u_proc_info(char *, char **, off_t, int, int, int);
#define ATP870U { \ #define ATP870U { \
next: NULL, \
module: NULL, \
proc_info: atp870u_proc_info, \ proc_info: atp870u_proc_info, \
name: NULL, \
detect: atp870u_detect, \ detect: atp870u_detect, \
release: atp870u_release, \ release: atp870u_release, \
info: atp870u_info, \ info: atp870u_info, \
command: atp870u_command, \ command: atp870u_command, \
queuecommand: atp870u_queuecommand, \ queuecommand: atp870u_queuecommand, \
eh_strategy_handler: NULL, \
eh_abort_handler: atp870u_abort, \ eh_abort_handler: atp870u_abort, \
slave_attach: NULL, \
bios_param: atp870u_biosparam, \ bios_param: atp870u_biosparam, \
can_queue: qcnt, /* max simultaneous cmds */\ can_queue: qcnt, /* max simultaneous cmds */\
this_id: 7, /* scsi id of host adapter */\ this_id: 7, /* scsi id of host adapter */\
......
...@@ -860,8 +860,6 @@ static Scsi_Host_Template idescsi_template = { ...@@ -860,8 +860,6 @@ static Scsi_Host_Template idescsi_template = {
info: idescsi_info, info: idescsi_info,
ioctl: idescsi_ioctl, ioctl: idescsi_ioctl,
queuecommand: idescsi_queue, queuecommand: idescsi_queue,
abort: idescsi_abort,
reset: idescsi_reset,
bios_param: idescsi_bios, bios_param: idescsi_bios,
can_queue: 10, can_queue: 10,
this_id: -1, this_id: -1,
......
...@@ -352,7 +352,6 @@ static Scsi_Host_Template driver_template = { ...@@ -352,7 +352,6 @@ static Scsi_Host_Template driver_template = {
.eh_device_reset_handler = NULL, .eh_device_reset_handler = NULL,
.eh_bus_reset_handler = nsp32_eh_bus_reset, .eh_bus_reset_handler = nsp32_eh_bus_reset,
.eh_host_reset_handler = nsp32_eh_host_reset, .eh_host_reset_handler = nsp32_eh_host_reset,
.reset = nsp32_reset,
.release = nsp32_release, .release = nsp32_release,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2))
.use_new_eh_code = 1, .use_new_eh_code = 1,
...@@ -1575,11 +1574,7 @@ static int nsp32_proc_info(char *buffer, ...@@ -1575,11 +1574,7 @@ static int nsp32_proc_info(char *buffer,
} }
/* search this HBA host */ /* search this HBA host */
for (host=scsi_hostlist; host; host=host->next) { host=scsi_host_hn_get(hostno);
if (host->host_no == hostno) {
break;
}
}
if (host == NULL) { if (host == NULL) {
return -ESRCH; return -ESRCH;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment