[PATCH] Update version information

2007-09-22 Thread Bernhard Walle 
This patch just makes the version number in ips.c and ips.h consistent. It
seems that this has been forgotten in a60768e2d43eb30a1adb8a119aeac35dc0d03ef6.

It also removes code duplication, each number is now only once in the code to
avoid similar errors in the future.


Signed-off-by: Bernhard Walle <[EMAIL PROTECTED]>

---
 drivers/scsi/ips.c |4 ++--
 drivers/scsi/ips.h |   11 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -204,8 +204,8 @@ module_param(ips, charp, 0);
 /*
  * DRIVER_VER
  */
-#define IPS_VERSION_HIGH"7.12"
-#define IPS_VERSION_LOW ".05 "
+#define IPS_VERSION_HIGHIPS_VER_MAJOR_STRING "." IPS_VER_MINOR_STRING
+#define IPS_VERSION_LOW "." IPS_VER_BUILD_STRING " "
 
 #if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
 #warning "This driver has only been tested on the x86/ia64/x86_64 platforms"
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -1172,12 +1172,13 @@ typedef struct {
 */
 
 #define IPS_VER_MAJOR 7
-#define IPS_VER_MAJOR_STRING "7"
+#define IPS_VER_MAJOR_STRING __stringify(IPS_VER_MAJOR)
 #define IPS_VER_MINOR 12
-#define IPS_VER_MINOR_STRING "12"
-#define IPS_VER_BUILD 02
-#define IPS_VER_BUILD_STRING "02"
-#define IPS_VER_STRING "7.12.02"
+#define IPS_VER_MINOR_STRING __stringify(IPS_VER_MINOR)
+#define IPS_VER_BUILD 05
+#define IPS_VER_BUILD_STRING __stringify(IPS_VER_BUILD)
+#define IPS_VER_STRING IPS_VER_MAJOR_STRING "." \
+   IPS_VER_MINOR_STRING "." IPS_VER_BUILD_STRING
 #define IPS_RELEASE_ID 0x0002
 #define IPS_BUILD_IDENT 761
 #define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All 
Rights Reserved."
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] Update version information

2007-09-22 Thread Bernhard Walle 
This patch just makes the version number in ips.c and ips.h consistent. It
seems that this has been forgotten in a60768e2d43eb30a1adb8a119aeac35dc0d03ef6.

It also removes code duplication, each number is now only once in the code to
avoid similar errors in the future.


Signed-off-by: Bernhard Walle [EMAIL PROTECTED]

---
 drivers/scsi/ips.c |4 ++--
 drivers/scsi/ips.h |   11 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -204,8 +204,8 @@ module_param(ips, charp, 0);
 /*
  * DRIVER_VER
  */
-#define IPS_VERSION_HIGH7.12
-#define IPS_VERSION_LOW .05 
+#define IPS_VERSION_HIGHIPS_VER_MAJOR_STRING . IPS_VER_MINOR_STRING
+#define IPS_VERSION_LOW . IPS_VER_BUILD_STRING  
 
 #if !defined(__i386__)  !defined(__ia64__)  !defined(__x86_64__)
 #warning This driver has only been tested on the x86/ia64/x86_64 platforms
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -1172,12 +1172,13 @@ typedef struct {
 */
 
 #define IPS_VER_MAJOR 7
-#define IPS_VER_MAJOR_STRING 7
+#define IPS_VER_MAJOR_STRING __stringify(IPS_VER_MAJOR)
 #define IPS_VER_MINOR 12
-#define IPS_VER_MINOR_STRING 12
-#define IPS_VER_BUILD 02
-#define IPS_VER_BUILD_STRING 02
-#define IPS_VER_STRING 7.12.02
+#define IPS_VER_MINOR_STRING __stringify(IPS_VER_MINOR)
+#define IPS_VER_BUILD 05
+#define IPS_VER_BUILD_STRING __stringify(IPS_VER_BUILD)
+#define IPS_VER_STRING IPS_VER_MAJOR_STRING . \
+   IPS_VER_MINOR_STRING . IPS_VER_BUILD_STRING
 #define IPS_RELEASE_ID 0x0002
 #define IPS_BUILD_IDENT 761
 #define IPS_LEGALCOPYRIGHT_STRING (C) Copyright IBM Corp. 1994, 2002. All 
Rights Reserved.
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Update version information of ips driver

2007-09-04 Thread Adrian Bunk 
On Tue, Sep 04, 2007 at 04:16:26PM +0200, Bernhard Walle wrote:
> This patch just makes the version number in ips.c and ips.h consistent. It
> seems that this has been forgotten in 
> a60768e2d43eb30a1adb8a119aeac35dc0d03ef6.

A better fix would be to no longer have two different places defining a 
version number.

> Signed-off-by: Bernhard Walle <[EMAIL PROTECTED]>
> 
> ---
>  drivers/scsi/ips.h |6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> --- a/drivers/scsi/ips.h
> +++ b/drivers/scsi/ips.h
> @@ -1175,9 +1175,9 @@ typedef struct {
>  #define IPS_VER_MAJOR_STRING "7"
>  #define IPS_VER_MINOR 12
>  #define IPS_VER_MINOR_STRING "12"
> -#define IPS_VER_BUILD 02
> -#define IPS_VER_BUILD_STRING "02"
> -#define IPS_VER_STRING "7.12.02"
> +#define IPS_VER_BUILD 05
> +#define IPS_VER_BUILD_STRING "05"
> +#define IPS_VER_STRING "7.12.05"
>  #define IPS_RELEASE_ID 0x0002
>  #define IPS_BUILD_IDENT 761
>  #define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All 
> Rights Reserved."

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] Update version information of ips driver

2007-09-04 Thread Bernhard Walle 
This patch just makes the version number in ips.c and ips.h consistent. It
seems that this has been forgotten in a60768e2d43eb30a1adb8a119aeac35dc0d03ef6.


Signed-off-by: Bernhard Walle <[EMAIL PROTECTED]>

---
 drivers/scsi/ips.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -1175,9 +1175,9 @@ typedef struct {
 #define IPS_VER_MAJOR_STRING "7"
 #define IPS_VER_MINOR 12
 #define IPS_VER_MINOR_STRING "12"
-#define IPS_VER_BUILD 02
-#define IPS_VER_BUILD_STRING "02"
-#define IPS_VER_STRING "7.12.02"
+#define IPS_VER_BUILD 05
+#define IPS_VER_BUILD_STRING "05"
+#define IPS_VER_STRING "7.12.05"
 #define IPS_RELEASE_ID 0x0002
 #define IPS_BUILD_IDENT 761
 #define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All 
Rights Reserved."
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Update version information of ips driver

2007-09-04 Thread Adrian Bunk 
On Tue, Sep 04, 2007 at 04:16:26PM +0200, Bernhard Walle wrote:
 This patch just makes the version number in ips.c and ips.h consistent. It
 seems that this has been forgotten in 
 a60768e2d43eb30a1adb8a119aeac35dc0d03ef6.

A better fix would be to no longer have two different places defining a 
version number.

 Signed-off-by: Bernhard Walle [EMAIL PROTECTED]
 
 ---
  drivers/scsi/ips.h |6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 --- a/drivers/scsi/ips.h
 +++ b/drivers/scsi/ips.h
 @@ -1175,9 +1175,9 @@ typedef struct {
  #define IPS_VER_MAJOR_STRING 7
  #define IPS_VER_MINOR 12
  #define IPS_VER_MINOR_STRING 12
 -#define IPS_VER_BUILD 02
 -#define IPS_VER_BUILD_STRING 02
 -#define IPS_VER_STRING 7.12.02
 +#define IPS_VER_BUILD 05
 +#define IPS_VER_BUILD_STRING 05
 +#define IPS_VER_STRING 7.12.05
  #define IPS_RELEASE_ID 0x0002
  #define IPS_BUILD_IDENT 761
  #define IPS_LEGALCOPYRIGHT_STRING (C) Copyright IBM Corp. 1994, 2002. All 
 Rights Reserved.

cu
Adrian

-- 

   Is there not promise of rain? Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   Only a promise, Lao Er said.
   Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/