diff options
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_sds.c | 10 | ||||
-rw-r--r-- | drivers/scsi/scsi_transport_sas.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index a6fb33f1412d..421e98e1d522 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include "aic94xx_seq.h" | 38 | #include "aic94xx_seq.h" |
39 | 39 | ||
40 | /* The format is "version.release.patchlevel" */ | 40 | /* The format is "version.release.patchlevel" */ |
41 | #define ASD_DRIVER_VERSION "1.0.2" | 41 | #define ASD_DRIVER_VERSION "1.0.3" |
42 | 42 | ||
43 | static int use_msi = 0; | 43 | static int use_msi = 0; |
44 | module_param_named(use_msi, use_msi, int, S_IRUGO); | 44 | module_param_named(use_msi, use_msi, int, S_IRUGO); |
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c index e5a0ec37e954..5b0932f61473 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.c +++ b/drivers/scsi/aic94xx/aic94xx_sds.c | |||
@@ -427,7 +427,7 @@ struct asd_manuf_sec { | |||
427 | 427 | ||
428 | struct asd_manuf_phy_desc { | 428 | struct asd_manuf_phy_desc { |
429 | u8 state; /* low 4 bits */ | 429 | u8 state; /* low 4 bits */ |
430 | #define MS_PHY_STATE_ENABLEABLE 0 | 430 | #define MS_PHY_STATE_ENABLED 0 |
431 | #define MS_PHY_STATE_REPORTED 1 | 431 | #define MS_PHY_STATE_REPORTED 1 |
432 | #define MS_PHY_STATE_HIDDEN 2 | 432 | #define MS_PHY_STATE_HIDDEN 2 |
433 | u8 phy_id; | 433 | u8 phy_id; |
@@ -756,11 +756,11 @@ static void *asd_find_ll_by_id(void * const start, const u8 id0, const u8 id1) | |||
756 | * | 756 | * |
757 | * HIDDEN phys do not count in the total count. REPORTED phys cannot | 757 | * HIDDEN phys do not count in the total count. REPORTED phys cannot |
758 | * be enabled but are reported and counted towards the total. | 758 | * be enabled but are reported and counted towards the total. |
759 | * ENEBLEABLE phys are enabled by default and count towards the total. | 759 | * ENABLED phys are enabled by default and count towards the total. |
760 | * The absolute total phy number is ASD_MAX_PHYS. hw_prof->num_phys | 760 | * The absolute total phy number is ASD_MAX_PHYS. hw_prof->num_phys |
761 | * merely specifies the number of phys the host adapter decided to | 761 | * merely specifies the number of phys the host adapter decided to |
762 | * report. E.g., it is possible for phys 0, 1 and 2 to be HIDDEN, | 762 | * report. E.g., it is possible for phys 0, 1 and 2 to be HIDDEN, |
763 | * phys 3, 4 and 5 to be REPORTED and phys 6 and 7 to be ENEBLEABLE. | 763 | * phys 3, 4 and 5 to be REPORTED and phys 6 and 7 to be ENABLED. |
764 | * In this case ASD_MAX_PHYS is 8, hw_prof->num_phys is 5, and only 2 | 764 | * In this case ASD_MAX_PHYS is 8, hw_prof->num_phys is 5, and only 2 |
765 | * are actually enabled (enabled by default, max number of phys | 765 | * are actually enabled (enabled by default, max number of phys |
766 | * enableable in this case). | 766 | * enableable in this case). |
@@ -816,8 +816,8 @@ static int asd_ms_get_phy_params(struct asd_ha_struct *asd_ha, | |||
816 | asd_ha->hw_prof.enabled_phys &= ~(1 << i); | 816 | asd_ha->hw_prof.enabled_phys &= ~(1 << i); |
817 | rep_phys++; | 817 | rep_phys++; |
818 | continue; | 818 | continue; |
819 | case MS_PHY_STATE_ENABLEABLE: | 819 | case MS_PHY_STATE_ENABLED: |
820 | ASD_DPRINTK("ms: phy%d: ENEBLEABLE\n", i); | 820 | ASD_DPRINTK("ms: phy%d: ENABLED\n", i); |
821 | asd_ha->hw_prof.enabled_phys |= (1 << i); | 821 | asd_ha->hw_prof.enabled_phys |= (1 << i); |
822 | en_phys++; | 822 | en_phys++; |
823 | break; | 823 | break; |
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c index bfbcf5fa72b9..ce232803f433 100644 --- a/drivers/scsi/scsi_transport_sas.c +++ b/drivers/scsi/scsi_transport_sas.c | |||
@@ -1638,7 +1638,7 @@ static void __exit sas_transport_exit(void) | |||
1638 | } | 1638 | } |
1639 | 1639 | ||
1640 | MODULE_AUTHOR("Christoph Hellwig"); | 1640 | MODULE_AUTHOR("Christoph Hellwig"); |
1641 | MODULE_DESCRIPTION("SAS Transphy Attributes"); | 1641 | MODULE_DESCRIPTION("SAS Transport Attributes"); |
1642 | MODULE_LICENSE("GPL"); | 1642 | MODULE_LICENSE("GPL"); |
1643 | 1643 | ||
1644 | module_init(sas_transport_init); | 1644 | module_init(sas_transport_init); |