aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsas
diff options
context:
space:
mode:
authorJeff Skirvin <jeffrey.d.skirvin@intel.com>2011-12-16 03:21:21 -0500
committerJames Bottomley <JBottomley@Parallels.com>2012-02-19 15:20:09 -0500
commit1f4fe89c9c78d3163cf1e389bdc6438a44b64244 (patch)
tree7f2ac7da0fc682687b0848da9c13babd25f4f620 /drivers/scsi/libsas
parent2a559f4ba443265b4c58925b48296f1cf81b49f9 (diff)
[SCSI] libsas: Remove redundant phy state notification calls.
In the case of an explicit sas_phy_enable call to disable a phy, the LLDD provides the calls to sas_phy_disconnected and the PHYE_LOSS_OF_SIGNAL event. NOTE: This assumes that the lldd(s) generate the notification, which appears to be the case, but only verfied on isci. Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/libsas')
-rw-r--r--drivers/scsi/libsas/sas_init.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 53ae893e8b0b..cf1b532b0e76 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -268,11 +268,8 @@ static int sas_phy_enable(struct sas_phy *phy, int enable)
268 268
269 if (enable) 269 if (enable)
270 ret = transport_sas_phy_reset(phy, 0); 270 ret = transport_sas_phy_reset(phy, 0);
271 else { 271 else
272 sas_phy_disconnected(asd_phy);
273 sas_ha->notify_phy_event(asd_phy, PHYE_LOSS_OF_SIGNAL);
274 ret = i->dft->lldd_control_phy(asd_phy, cmd, NULL); 272 ret = i->dft->lldd_control_phy(asd_phy, cmd, NULL);
275 }
276 } else { 273 } else {
277 struct sas_rphy *rphy = dev_to_rphy(phy->dev.parent); 274 struct sas_rphy *rphy = dev_to_rphy(phy->dev.parent);
278 struct domain_device *ddev = sas_find_dev_by_rphy(rphy); 275 struct domain_device *ddev = sas_find_dev_by_rphy(rphy);