Skip to contentSkip to conversation

aic94xx: fix typos and update verison number

PATCH New Alexis Bruemmer 2 participants 2 messages Jan 16, 2007 SCSI

lore
Share & tools
lore

Alexis Bruemmer

author
#0 lore raw

PATCH 1/1 aic94xx: fix typos and update verison number

fix typos and bump version number

Signed-off-by Darrick J. Wong <[email protected]>
Acked-by Alexis Bruemmer <[email protected]>

---

 drivers/scsi/aic94xx/aic94xx_init.c |    2 +-
 drivers/scsi/aic94xx/aic94xx_sds.c  |   10 +++++-----
 drivers/scsi/scsi_transport_sas.c   |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/aic94xx/aic94xx_init.c +1 -1
index f391585..2a8e309 100644
@@ -38,7 +38,7 @@ #include "aic94xx_hwi.h"
 #include "aic94xx_seq.h"
 
 /* The format is "version.release.patchlevel" */
-#define ASD_DRIVER_VERSION "1.0.3"
+#define ASD_DRIVER_VERSION "1.0.2"
 
 static int use_msi = 0;
 module_param_named(use_msi, use_msi, int, S_IRUGO);
drivers/scsi/aic94xx/aic94xx_sds.c +5 -5
index e5a0ec3..5b0932f 100644
@@ -427,7 +427,7 @@ struct asd_manuf_sec {
 
 struct asd_manuf_phy_desc {
 	u8    state;         /* low 4 bits */
-#define MS_PHY_STATE_ENABLEABLE 0
+#define MS_PHY_STATE_ENABLED    0
 #define MS_PHY_STATE_REPORTED   1
 #define MS_PHY_STATE_HIDDEN     2
 	u8    phy_id;

@@ -756,11 +756,11 @@ static void *asd_find_ll_by_id(void * co
  *
  * HIDDEN phys do not count in the total count.  REPORTED phys cannot
  * be enabled but are reported and counted towards the total.
- * ENEBLEABLE phys are enabled by default and count towards the total.
+ * ENABLED phys are enabled by default and count towards the total.
  * The absolute total phy number is ASD_MAX_PHYS.  hw_prof->num_phys
  * merely specifies the number of phys the host adapter decided to
  * report.  E.g., it is possible for phys 0, 1 and 2 to be HIDDEN,
- * phys 3, 4 and 5 to be REPORTED and phys 6 and 7 to be ENEBLEABLE.
+ * phys 3, 4 and 5 to be REPORTED and phys 6 and 7 to be ENABLED.
  * In this case ASD_MAX_PHYS is 8, hw_prof->num_phys is 5, and only 2
  * are actually enabled (enabled by default, max number of phys
  * enableable in this case).

@@ -816,8 +816,8 @@ static int asd_ms_get_phy_params(struct 
 			asd_ha->hw_prof.enabled_phys &= ~(1 << i);
 			rep_phys++;
 			continue;
-		case MS_PHY_STATE_ENABLEABLE:
-			ASD_DPRINTK("ms: phy%d: ENEBLEABLE\n", i);
+		case MS_PHY_STATE_ENABLED:
+			ASD_DPRINTK("ms: phy%d: ENABLED\n", i);
 			asd_ha->hw_prof.enabled_phys |= (1 << i);
 			en_phys++;
 			break;
drivers/scsi/scsi_transport_sas.c +1 -1
index f4a7a9e..0fcd332 100644
@@ -1761,7 +1761,7 @@ static void __exit sas_transport_exit(vo
 }
 
 MODULE_AUTHOR("Christoph Hellwig");
-MODULE_DESCRIPTION("SAS Transphy Attributes");
+MODULE_DESCRIPTION("SAS Transport Attributes");
 MODULE_LICENSE("GPL");
 
 module_init(sas_transport_init);
#1 lore raw

PATCH v2 1/1 aic94xx: fix typos and update verison number

libsas: Fix typos and bump version number

Fix a few typos with the driver--"enableable" should be "enabled". Also bump version to 1.0.3 due to major changes recently. Supersedes earlier patch that had the version bump reversed because stgit got confused...

Signed-off-by Darrick J. Wong <[email protected]>

---

 drivers/scsi/aic94xx/aic94xx_init.c |    2 +-
 drivers/scsi/aic94xx/aic94xx_sds.c  |   10 +++++-----
 drivers/scsi/scsi_transport_sas.c   |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/aic94xx/aic94xx_init.c +1 -1
index 2a8e309..f391585 100644
@@ -38,7 +38,7 @@ #include "aic94xx_hwi.h"
 #include "aic94xx_seq.h"
 
 /* The format is "version.release.patchlevel" */
-#define ASD_DRIVER_VERSION "1.0.2"
+#define ASD_DRIVER_VERSION "1.0.3"
 
 static int use_msi = 0;
 module_param_named(use_msi, use_msi, int, S_IRUGO);
drivers/scsi/aic94xx/aic94xx_sds.c +5 -5
index e5a0ec3..5b0932f 100644
@@ -427,7 +427,7 @@ struct asd_manuf_sec {
 
 struct asd_manuf_phy_desc {
 	u8    state;         /* low 4 bits */
-#define MS_PHY_STATE_ENABLEABLE 0
+#define MS_PHY_STATE_ENABLED    0
 #define MS_PHY_STATE_REPORTED   1
 #define MS_PHY_STATE_HIDDEN     2
 	u8    phy_id;

@@ -756,11 +756,11 @@ static void *asd_find_ll_by_id(void * co
  *
  * HIDDEN phys do not count in the total count.  REPORTED phys cannot
  * be enabled but are reported and counted towards the total.
- * ENEBLEABLE phys are enabled by default and count towards the total.
+ * ENABLED phys are enabled by default and count towards the total.
  * The absolute total phy number is ASD_MAX_PHYS.  hw_prof->num_phys
  * merely specifies the number of phys the host adapter decided to
  * report.  E.g., it is possible for phys 0, 1 and 2 to be HIDDEN,
- * phys 3, 4 and 5 to be REPORTED and phys 6 and 7 to be ENEBLEABLE.
+ * phys 3, 4 and 5 to be REPORTED and phys 6 and 7 to be ENABLED.
  * In this case ASD_MAX_PHYS is 8, hw_prof->num_phys is 5, and only 2
  * are actually enabled (enabled by default, max number of phys
  * enableable in this case).

@@ -816,8 +816,8 @@ static int asd_ms_get_phy_params(struct 
 			asd_ha->hw_prof.enabled_phys &= ~(1 << i);
 			rep_phys++;
 			continue;
-		case MS_PHY_STATE_ENABLEABLE:
-			ASD_DPRINTK("ms: phy%d: ENEBLEABLE\n", i);
+		case MS_PHY_STATE_ENABLED:
+			ASD_DPRINTK("ms: phy%d: ENABLED\n", i);
 			asd_ha->hw_prof.enabled_phys |= (1 << i);
 			en_phys++;
 			break;
drivers/scsi/scsi_transport_sas.c +1 -1
index f4a7a9e..0fcd332 100644
@@ -1761,7 +1761,7 @@ static void __exit sas_transport_exit(vo
 }
 
 MODULE_AUTHOR("Christoph Hellwig");
-MODULE_DESCRIPTION("SAS Transphy Attributes");
+MODULE_DESCRIPTION("SAS Transport Attributes");
 MODULE_LICENSE("GPL");
 
 module_init(sas_transport_init);