tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: 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>

authored by

Hannes Reinecke and committed by
Martin K. Petersen aceb2948 1b7092f3

+4 -7
+4 -7
drivers/scsi/hptiop.c
··· 1106 1106 1107 1107 static int hptiop_reset(struct scsi_cmnd *scp) 1108 1108 { 1109 - struct Scsi_Host * host = scp->device->host; 1110 - struct hptiop_hba * hba = (struct hptiop_hba *)host->hostdata; 1109 + struct hptiop_hba * hba = (struct hptiop_hba *)scp->device->host->hostdata; 1111 1110 1112 - printk(KERN_WARNING "hptiop_reset(%d/%d/%d) scp=%p\n", 1113 - scp->device->host->host_no, scp->device->channel, 1114 - scp->device->id, scp); 1111 + printk(KERN_WARNING "hptiop_reset(%d/%d/%d)\n", 1112 + scp->device->host->host_no, -1, -1); 1115 1113 1116 1114 return hptiop_reset_hba(hba)? FAILED : SUCCESS; 1117 1115 } ··· 1177 1179 .module = THIS_MODULE, 1178 1180 .name = driver_name, 1179 1181 .queuecommand = hptiop_queuecommand, 1180 - .eh_device_reset_handler = hptiop_reset, 1181 - .eh_bus_reset_handler = hptiop_reset, 1182 + .eh_host_reset_handler = hptiop_reset, 1182 1183 .info = hptiop_info, 1183 1184 .emulated = 0, 1184 1185 .use_clustering = ENABLE_CLUSTERING,