Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a56c1c1 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: qlogicfas: move bus_reset to host_reset 



The bus reset handler is really a host reset.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 12e5fc66

drivers/scsi/pcmcia/qlogic_stub.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static struct scsi_host_template qlogicfas_driver_template = { 
	.info			= qlogicfas408_info,

	.queuecommand		= qlogicfas408_queuecommand,

	.eh_abort_handler	= qlogicfas408_abort,

	.eh_bus_reset_handler	= qlogicfas408_bus_reset,

	.eh_host_reset_handler	= qlogicfas408_host_reset,

	.bios_param		= qlogicfas408_biosparam,

	.can_queue		= 1,

	.this_id		= -1,
@@ -264,7 +264,7 @@ static int qlogic_resume(struct pcmcia_device *link) 
		outb(0x04, link->resource[0]->start + 0xd);

	}

	/* Ugggglllyyyy!!! */

	qlogicfas408_bus_reset(NULL);

	qlogicfas408_host_reset(NULL);



	return 0;

}

drivers/scsi/qlogicfas.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static struct scsi_host_template qlogicfas_driver_template = { 
	.info			= qlogicfas408_info,

	.queuecommand		= qlogicfas408_queuecommand,

	.eh_abort_handler	= qlogicfas408_abort,

	.eh_bus_reset_handler	= qlogicfas408_bus_reset,

	.eh_host_reset_handler	= qlogicfas408_host_reset,

	.bios_param		= qlogicfas408_biosparam,

	.can_queue		= 1,

	.this_id		= -1,

drivers/scsi/qlogicfas408.c

+3 −3
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ int qlogicfas408_abort(struct scsi_cmnd *cmd) 
 *	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);

	unsigned long flags;
@@ -607,7 +607,7 @@ module_exit(qlogicfas408_exit); 
EXPORT_SYMBOL(qlogicfas408_info);

EXPORT_SYMBOL(qlogicfas408_queuecommand);

EXPORT_SYMBOL(qlogicfas408_abort);

EXPORT_SYMBOL(qlogicfas408_bus_reset);

EXPORT_SYMBOL(qlogicfas408_host_reset);

EXPORT_SYMBOL(qlogicfas408_biosparam);

EXPORT_SYMBOL(qlogicfas408_ihandl);

EXPORT_SYMBOL(qlogicfas408_get_chip_type);

drivers/scsi/qlogicfas408.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ int qlogicfas408_biosparam(struct scsi_device * disk, 
			   struct block_device *dev,

			   sector_t capacity, int ip[]);

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);

int qlogicfas408_get_chip_type(int qbase, int int_type);

void qlogicfas408_setup(int qbase, int id, int int_type);