diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2011-12-12 20:32:09 -0800 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2012-02-29 15:16:52 -0600 |
| commit | 5a998328296cb16cb8b0307a402a0f2feab533c5 (patch) | |
| tree | 25c3a355256a895189d993b8b45ce029e5eab204 /drivers/scsi/isci/remote_device.h | |
| parent | [SCSI] isci: remove bus and reset handlers (diff) | |
| download | linux-dev-5a998328296cb16cb8b0307a402a0f2feab533c5.tar.xz linux-dev-5a998328296cb16cb8b0307a402a0f2feab533c5.zip | |
[SCSI] isci: remove IDEV_EH hack to disable "discovery-time" ata resets
Prior to commit 61aaff49 "isci: filter broadcast change notifications
during SMP phy resets" we borrowed the MVS_DEV_EH approach from the
mvsas driver for preventing ->lldd_I_T_nexus_reset() events during ata
discovery. This hack was protecting against the old ->phy_reset() in
ata_bus_probe(), but since the conversion to the new error handling this
hack is preventing resets from reaching ata devices.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci/remote_device.h')
| -rw-r--r-- | drivers/scsi/isci/remote_device.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h index 483ee50152f3..98c2801ed089 100644 --- a/drivers/scsi/isci/remote_device.h +++ b/drivers/scsi/isci/remote_device.h @@ -82,10 +82,9 @@ struct isci_remote_device { #define IDEV_START_PENDING 0 #define IDEV_STOP_PENDING 1 #define IDEV_ALLOCATED 2 - #define IDEV_EH 3 - #define IDEV_GONE 4 - #define IDEV_IO_READY 5 - #define IDEV_IO_NCQERROR 6 + #define IDEV_GONE 3 + #define IDEV_IO_READY 4 + #define IDEV_IO_NCQERROR 5 unsigned long flags; struct kref kref; struct isci_port *isci_port; |