diff options
| author | Tejun Heo <tj@kernel.org> | 2016-05-09 18:34:39 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-05-09 18:34:39 +0200 |
| commit | 698f6700a6f19ba4550a722eaacf9f9d212b3fd9 (patch) | |
| tree | ff63c9a23fe47870df8788ff5e7d9a552f6d4ed1 /drivers/scsi/snic/snic_ctl.c | |
| parent | libata-scsi: Set information sense field for invalid parameter (diff) | |
| parent | megaraid_sas: Downgrade two success messages to info (diff) | |
| download | linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.tar.xz linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.zip | |
Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac
Pulling in the dependencies for further ZAC changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/scsi/snic/snic_ctl.c')
| -rw-r--r-- | drivers/scsi/snic/snic_ctl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/snic/snic_ctl.c b/drivers/scsi/snic/snic_ctl.c index ab0e06b0b4ff..449b03f3bbd3 100644 --- a/drivers/scsi/snic/snic_ctl.c +++ b/drivers/scsi/snic/snic_ctl.c @@ -39,17 +39,15 @@ snic_handle_link(struct work_struct *work) { struct snic *snic = container_of(work, struct snic, link_work); - if (snic->config.xpt_type != SNIC_DAS) { - SNIC_HOST_INFO(snic->shost, "Link Event Received.\n"); - SNIC_ASSERT_NOT_IMPL(1); - + if (snic->config.xpt_type == SNIC_DAS) return; - } snic->link_status = svnic_dev_link_status(snic->vdev); snic->link_down_cnt = svnic_dev_link_down_cnt(snic->vdev); SNIC_HOST_INFO(snic->shost, "Link Event: Link %s.\n", ((snic->link_status) ? "Up" : "Down")); + + SNIC_ASSERT_NOT_IMPL(1); } |