leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: qlogicfas: move bus_reset to host_reset

Browse Source 
The bus reset handler is really a host reset.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2017-08-25 13:57:11 +02:00 committed by Martin K. Petersen
parent 12e5fc665a
commit 4a56c1c166
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/pcmcia/qlogic_stub.c
View File

@ -67,7 +67,7 @@ static struct scsi_host_template qlogicfas_driver_template = {
.info = qlogicfas408_info, .info = qlogicfas408_info,
.queuecommand = qlogicfas408_queuecommand, .queuecommand = qlogicfas408_queuecommand,
.eh_abort_handler = qlogicfas408_abort, .eh_abort_handler = qlogicfas408_abort,
.eh_bus_reset_handler = qlogicfas408_bus_reset, .eh_host_reset_handler = qlogicfas408_host_reset,
.bios_param = qlogicfas408_biosparam, .bios_param = qlogicfas408_biosparam,
.can_queue = 1, .can_queue = 1,
.this_id = -1, .this_id = -1,
@ -264,7 +264,7 @@ static int qlogic_resume(struct pcmcia_device *link)
outb(0x04, link->resource[0]->start + 0xd); outb(0x04, link->resource[0]->start + 0xd);
} }
/* Ugggglllyyyy!!! */ /* Ugggglllyyyy!!! */
qlogicfas408_bus_reset(NULL); qlogicfas408_host_reset(NULL);
return 0; return 0;
} }

2
drivers/scsi/qlogicfas.c
View File

@ -188,7 +188,7 @@ static struct scsi_host_template qlogicfas_driver_template = {
.info = qlogicfas408_info, .info = qlogicfas408_info,
.queuecommand = qlogicfas408_queuecommand, .queuecommand = qlogicfas408_queuecommand,
.eh_abort_handler = qlogicfas408_abort, .eh_abort_handler = qlogicfas408_abort,
.eh_bus_reset_handler = qlogicfas408_bus_reset, .eh_host_reset_handler = qlogicfas408_host_reset,
.bios_param = qlogicfas408_biosparam, .bios_param = qlogicfas408_biosparam,
.can_queue = 1, .can_queue = 1,
.this_id = -1, .this_id = -1,

6
drivers/scsi/qlogicfas408.c
View File

@ -496,13 +496,13 @@ int qlogicfas408_abort(struct scsi_cmnd *cmd)
return SUCCESS; return SUCCESS;
} }
/* /*
* Reset SCSI bus * Reset SCSI bus
* FIXME: This function is invoked with cmd = NULL directly by * FIXME: This function is invoked with cmd = NULL directly by
* the PCMCIA qlogic_stub code. This wants fixing * the PCMCIA qlogic_stub code. This wants fixing
*/ */
int qlogicfas408_bus_reset(struct scsi_cmnd *cmd) int qlogicfas408_host_reset(struct scsi_cmnd *cmd)
{ {
struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd); struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
unsigned long flags; unsigned long flags;
@ -607,7 +607,7 @@ module_exit(qlogicfas408_exit);
EXPORT_SYMBOL(qlogicfas408_info); EXPORT_SYMBOL(qlogicfas408_info);
EXPORT_SYMBOL(qlogicfas408_queuecommand); EXPORT_SYMBOL(qlogicfas408_queuecommand);
EXPORT_SYMBOL(qlogicfas408_abort); EXPORT_SYMBOL(qlogicfas408_abort);
EXPORT_SYMBOL(qlogicfas408_bus_reset); EXPORT_SYMBOL(qlogicfas408_host_reset);
EXPORT_SYMBOL(qlogicfas408_biosparam); EXPORT_SYMBOL(qlogicfas408_biosparam);
EXPORT_SYMBOL(qlogicfas408_ihandl); EXPORT_SYMBOL(qlogicfas408_ihandl);
EXPORT_SYMBOL(qlogicfas408_get_chip_type); EXPORT_SYMBOL(qlogicfas408_get_chip_type);

2
drivers/scsi/qlogicfas408.h
View File

@ -108,7 +108,7 @@ int qlogicfas408_biosparam(struct scsi_device * disk,
struct block_device *dev, struct block_device *dev,
sector_t capacity, int ip[]); sector_t capacity, int ip[]);
int qlogicfas408_abort(struct scsi_cmnd * cmd); int qlogicfas408_abort(struct scsi_cmnd * cmd);
int qlogicfas408_bus_reset(struct scsi_cmnd * cmd); extern int qlogicfas408_host_reset(struct scsi_cmnd *cmd);
const char *qlogicfas408_info(struct Scsi_Host *host); const char *qlogicfas408_info(struct Scsi_Host *host);
int qlogicfas408_get_chip_type(int qbase, int int_type); int qlogicfas408_get_chip_type(int qbase, int int_type);
void qlogicfas408_setup(int qbase, int id, int int_type); void qlogicfas408_setup(int qbase, int id, int int_type);