diff options
author | James Bottomley <JBottomley@Parallels.com> | 2013-05-07 17:44:06 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 10:47:52 -0400 |
commit | aa9f8328fc51460e15da129caf622b6560fa8c99 (patch) | |
tree | 3ca4c2a29e94538acff4aae04214d5645eaeac02 /drivers/scsi/mvsas/mv_init.c | |
parent | a6cb3d012b983b350ae3892cff2e692665df0e1e (diff) |
[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 'drivers/scsi/mvsas/mv_init.c')
-rw-r--r-- | drivers/scsi/mvsas/mv_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index 74550922ad55..7b7381d7671f 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c | |||
@@ -254,7 +254,7 @@ static int mvs_alloc(struct mvs_info *mvi, struct Scsi_Host *shost) | |||
254 | } | 254 | } |
255 | for (i = 0; i < MVS_MAX_DEVICES; i++) { | 255 | for (i = 0; i < MVS_MAX_DEVICES; i++) { |
256 | mvi->devices[i].taskfileset = MVS_ID_NOT_MAPPED; | 256 | mvi->devices[i].taskfileset = MVS_ID_NOT_MAPPED; |
257 | mvi->devices[i].dev_type = NO_DEVICE; | 257 | mvi->devices[i].dev_type = SAS_PHY_UNUSED; |
258 | mvi->devices[i].device_id = i; | 258 | mvi->devices[i].device_id = i; |
259 | mvi->devices[i].dev_status = MVS_DEV_NORMAL; | 259 | mvi->devices[i].dev_status = MVS_DEV_NORMAL; |
260 | init_timer(&mvi->devices[i].timer); | 260 | init_timer(&mvi->devices[i].timer); |