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

Commit 6f4e75a4 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] libsas: kill sas_slave_destroy 



Per commit 3e4ec344 "libata: kill ATA_FLAG_DISABLED" needing to set
ATA_DEV_NONE is a holdover from before libsas converted to the
"new-style" ata-eh.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 95ac7fd1

drivers/scsi/aic94xx/aic94xx_init.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static struct scsi_host_template aic94xx_sht = { 
	.queuecommand		= sas_queuecommand,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= sas_slave_configure,

	.slave_destroy		= sas_slave_destroy,

	.scan_finished		= asd_scan_finished,

	.scan_start		= asd_scan_start,

	.change_queue_depth	= sas_change_queue_depth,

drivers/scsi/isci/init.c

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static struct scsi_host_template isci_sht = { 
	.queuecommand			= sas_queuecommand,

	.target_alloc			= sas_target_alloc,

	.slave_configure		= sas_slave_configure,

	.slave_destroy			= sas_slave_destroy,

	.scan_finished			= isci_host_scan_finished,

	.scan_start			= isci_host_scan_start,

	.change_queue_depth		= sas_change_queue_depth,

drivers/scsi/libsas/sas_scsi_host.c

+0 −9
Original line number Diff line number Diff line
@@ -797,14 +797,6 @@ int sas_slave_configure(struct scsi_device *scsi_dev) 
	return 0;

}



void sas_slave_destroy(struct scsi_device *scsi_dev)

{

	struct domain_device *dev = sdev_to_domain_dev(scsi_dev);



	if (dev_is_sata(dev))

		sas_to_ata_dev(dev)->class = ATA_DEV_NONE;

}



int sas_change_queue_depth(struct scsi_device *sdev, int depth, int reason)

{

	struct domain_device *dev = sdev_to_domain_dev(sdev);
@@ -1108,7 +1100,6 @@ EXPORT_SYMBOL_GPL(sas_request_addr); 
EXPORT_SYMBOL_GPL(sas_queuecommand);

EXPORT_SYMBOL_GPL(sas_target_alloc);

EXPORT_SYMBOL_GPL(sas_slave_configure);

EXPORT_SYMBOL_GPL(sas_slave_destroy);

EXPORT_SYMBOL_GPL(sas_change_queue_depth);

EXPORT_SYMBOL_GPL(sas_change_queue_type);

EXPORT_SYMBOL_GPL(sas_bios_param);

drivers/scsi/mvsas/mv_init.c

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static struct scsi_host_template mvs_sht = { 
	.queuecommand		= sas_queuecommand,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= sas_slave_configure,

	.slave_destroy		= sas_slave_destroy,

	.scan_finished		= mvs_scan_finished,

	.scan_start		= mvs_scan_start,

	.change_queue_depth	= sas_change_queue_depth,

drivers/scsi/pm8001/pm8001_init.c

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ static struct scsi_host_template pm8001_sht = { 
	.queuecommand		= sas_queuecommand,

	.target_alloc		= sas_target_alloc,

	.slave_configure	= sas_slave_configure,

	.slave_destroy		= sas_slave_destroy,

	.scan_finished		= pm8001_scan_finished,

	.scan_start		= pm8001_scan_start,

	.change_queue_depth	= sas_change_queue_depth,