diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 15:51:13 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-28 09:07:49 -0500 |
| commit | df64d3caab8db6ae17dacd229a03d7689a10c432 (patch) | |
| tree | 247fe4f9f39b22186e42e7f4687dd62c2690e47b /include/scsi | |
| parent | 653c42d552d0fd0b05485442aed45dd2d62269c0 (diff) | |
| download | linux-stable-df64d3caab8db6ae17dacd229a03d7689a10c432.tar.gz linux-stable-df64d3caab8db6ae17dacd229a03d7689a10c432.tar.bz2 linux-stable-df64d3caab8db6ae17dacd229a03d7689a10c432.zip | |
[SCSI] Unify SAM_ and SAM_STAT_ macros
We have two separate definitions for identical constants with nearly the
same name. One comes from the generic headers in scsi.h; the other is
an enum in libsas.h ... it's causing confusion about which one is
correct (fortunately they both are).
Fix this by eliminating the libsas.h duplicate
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/libsas.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 3b586859669c..d06e13be717b 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -422,16 +422,7 @@ enum service_response { }; enum exec_status { - SAM_GOOD = 0, - SAM_CHECK_COND = 2, - SAM_COND_MET = 4, - SAM_BUSY = 8, - SAM_INTERMEDIATE = 0x10, - SAM_IM_COND_MET = 0x12, - SAM_RESV_CONFLICT= 0x14, - SAM_TASK_SET_FULL= 0x28, - SAM_ACA_ACTIVE = 0x30, - SAM_TASK_ABORTED = 0x40, + /* The SAM_STAT_.. codes fit in the lower 6 bits */ SAS_DEV_NO_RESPONSE = 0x80, SAS_DATA_UNDERRUN, |