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

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

scsi: hptiop: Simplify reset handling 



The Highpoint driver only has one reset function, and that is a host
reset. So stop pretending we're doing anything else.

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 1b7092f3

drivers/scsi/hptiop.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -1106,12 +1106,10 @@ static int hptiop_reset_hba(struct hptiop_hba *hba) 




static int hptiop_reset(struct scsi_cmnd *scp)

static int hptiop_reset(struct scsi_cmnd *scp)

{

{

	struct Scsi_Host * host = scp->device->host;

	struct hptiop_hba * hba = (struct hptiop_hba *)scp->device->host->hostdata;

	struct hptiop_hba * hba = (struct hptiop_hba *)host->hostdata;





	printk(KERN_WARNING "hptiop_reset(%d/%d/%d) scp=%p\n",

	printk(KERN_WARNING "hptiop_reset(%d/%d/%d)\n",

			scp->device->host->host_no, scp->device->channel,

	       scp->device->host->host_no, -1, -1);

			scp->device->id, scp);





	return hptiop_reset_hba(hba)? FAILED : SUCCESS;

	return hptiop_reset_hba(hba)? FAILED : SUCCESS;

}

}
@@ -1179,8 +1177,7 @@ static struct scsi_host_template driver_template = { 
	.module                     = THIS_MODULE,

	.module                     = THIS_MODULE,

	.name                       = driver_name,

	.name                       = driver_name,

	.queuecommand               = hptiop_queuecommand,

	.queuecommand               = hptiop_queuecommand,

	.eh_device_reset_handler    = hptiop_reset,

	.eh_host_reset_handler      = hptiop_reset,

	.eh_bus_reset_handler       = hptiop_reset,

	.info                       = hptiop_info,

	.info                       = hptiop_info,

	.emulated                   = 0,

	.emulated                   = 0,

	.use_clustering             = ENABLE_CLUSTERING,

	.use_clustering             = ENABLE_CLUSTERING,