scsi: qlogicfas: move bus_reset to host_reset

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>

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index c670dc704c74eb09ca90be4f2cc49e3ede651926..0556054764dc15fe6deeb0d2096aeb6bf0fd613d 100644 (file)
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -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;
 }

diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index 840823b99e51a37505f4fce35fad9877153f10cd..95431d605c24c970563d863c11502fdb9b69eb3c 100644 (file)
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -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,

diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index c3a9151ca823cb64651390e940794262d9b7d989..8b471a925b43d82525f89f72209402f61a9562a7 100644 (file)
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -496,13 +496,13 @@ int qlogicfas408_abort(struct scsi_cmnd *cmd)
        return SUCCESS;
 }
 
-/* 
+/*
  *     Reset SCSI bus
  *     FIXME: This function is invoked with cmd = NULL directly by
  *     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);

diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h
index 2f6c0a166200fdea89aba2d8aee31281718a6be1..f6b1216af79f30464effab44a3c7c832cc23af4a 100644 (file)
--- a/drivers/scsi/qlogicfas408.h
+++ b/drivers/scsi/qlogicfas408.h
@@ -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);