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

Commit 28917d40 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: libsas: remove sas_scsi_timed_out 



EH_NOT_HANDLED is the default case if no eh_timed_out method is
provided, so there is no need to supply it.

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

drivers/scsi/libsas/sas_init.c

+0 −1
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ sas_domain_attach_transport(struct sas_domain_function_template *dft) 
	i = to_sas_internal(stt);

	i->dft = dft;

	stt->create_work_queue = 1;

	stt->eh_timed_out = sas_scsi_timed_out;

	stt->eh_strategy_handler = sas_scsi_recover_host;



	return stt;

drivers/scsi/libsas/sas_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ void sas_unregister_phys(struct sas_ha_struct *sas_ha); 
int  sas_register_ports(struct sas_ha_struct *sas_ha);

void sas_unregister_ports(struct sas_ha_struct *sas_ha);



enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *);



int  sas_init_events(struct sas_ha_struct *sas_ha);

void sas_disable_revalidation(struct sas_ha_struct *ha);

void sas_enable_revalidation(struct sas_ha_struct *ha);

drivers/scsi/libsas/sas_scsi_host.c

+0 −7
Original line number Diff line number Diff line
@@ -803,13 +803,6 @@ void sas_scsi_recover_host(struct Scsi_Host *shost) 
		    shost->host_failed, tries);

}



enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)

{

	scmd_dbg(cmd, "command %p timed out\n", cmd);



	return BLK_EH_NOT_HANDLED;

}



int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)

{

	struct domain_device *dev = sdev_to_domain_dev(sdev);