diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-05-07 23:44:06 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 16:47:52 +0200 |
| commit | aa9f8328fc51460e15da129caf622b6560fa8c99 (patch) | |
| tree | 3ca4c2a29e94538acff4aae04214d5645eaeac02 /include/scsi/libsas.h | |
| parent | [SCSI] pm80xx: thermal, sas controller config and error handling update (diff) | |
| download | linux-aa9f8328fc51460e15da129caf622b6560fa8c99.tar.xz linux-aa9f8328fc51460e15da129caf622b6560fa8c99.zip | |
[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
These enums have been separate since the dawn of SAS, mainly because the
latter is a procotol only enum and the former includes additional state
for libsas. The dichotomy causes endless confusion about which one you
should use where and leads to pointless warnings like this:
drivers/scsi/mvsas/mv_sas.c: In function 'mvs_update_phyinfo':
drivers/scsi/mvsas/mv_sas.c:1162:34: warning: comparison between 'enum sas_device_type' and 'enum sas_dev_type' [-Wenum-compare]
Fix by eliminating one of them. The one kept is effectively the sas.h
one, but call it sas_device_type and make sure the enums are all
properly namespaced with the SAS_ prefix.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi/libsas.h')
| -rw-r--r-- | include/scsi/libsas.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index ef937b56f9b5..e2c1e66d58ae 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -118,7 +118,7 @@ struct ex_phy { enum ex_phy_state phy_state; - enum sas_dev_type attached_dev_type; + enum sas_device_type attached_dev_type; enum sas_linkrate linkrate; u8 attached_sata_host:1; @@ -195,7 +195,7 @@ enum { struct domain_device { spinlock_t done_lock; - enum sas_dev_type dev_type; + enum sas_device_type dev_type; enum sas_linkrate linkrate; enum sas_linkrate min_linkrate; |