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

scsi: acornscsi: move bus reset to host reset

Browse Source 
The bus reset function is really a host reset, so move it to
eh_host_reset_handler.

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:09 +02:00 committed by Martin K. Petersen
parent af167bc42d
commit 74fa80ee3f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/arm/acornscsi.c
View File

@ -2725,23 +2725,24 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
* Params : SCpnt - command causing reset * Params : SCpnt - command causing reset
* Returns : one of SCSI_RESET_ macros * Returns : one of SCSI_RESET_ macros
*/ */
int acornscsi_bus_reset(struct scsi_cmnd *SCpnt) int acornscsi_host_reset(struct Scsi_Host *shpnt)
{ {
AS_Host *host = (AS_Host *)SCpnt->device->host->hostdata; AS_Host *host = (AS_Host *)shpnt->hostdata;
struct scsi_cmnd *SCptr; struct scsi_cmnd *SCptr;
host->stats.resets += 1; host->stats.resets += 1;
#if (DEBUG & DEBUG_RESET) #if (DEBUG & DEBUG_RESET)
{ {
int asr, ssr; int asr, ssr, devidx;
asr = sbic_arm_read(host, SBIC_ASR); asr = sbic_arm_read(host, SBIC_ASR);
ssr = sbic_arm_read(host, SBIC_SSR); ssr = sbic_arm_read(host, SBIC_SSR);
printk(KERN_WARNING "acornscsi_reset: "); printk(KERN_WARNING "acornscsi_reset: ");
print_sbic_status(asr, ssr, host->scsi.phase); print_sbic_status(asr, ssr, host->scsi.phase);
acornscsi_dumplog(host, SCpnt->device->id); for (devidx = 0; devidx < 9; devidx ++) {
acornscsi_dumplog(host, devidx);
} }
#endif #endif
@ -2884,7 +2885,7 @@ static struct scsi_host_template acornscsi_template = {
.info = acornscsi_info, .info = acornscsi_info,
.queuecommand = acornscsi_queuecmd, .queuecommand = acornscsi_queuecmd,
.eh_abort_handler = acornscsi_abort, .eh_abort_handler = acornscsi_abort,
.eh_bus_reset_handler = acornscsi_bus_reset, .eh_host_reset_handler = acornscsi_host_reset,
.can_queue = 16, .can_queue = 16,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,