4 files changed, 8 insertions, 25 deletions

diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index d93ad74a34c5..49e4deb50043 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -33,7 +33,6 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
@@ -44,6 +43,7 @@
 
 MODULE_DESCRIPTION("TI DaVinci VPIF Capture driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(VPIF_CAPTURE_VERSION);
 
 #define vpif_err(fmt, arg...)   v4l2_err(&vpif_obj.v4l2_dev, fmt, ## arg)
 #define vpif_dbg(level, debug, fmt, arg...)     \
@@ -1677,7 +1677,6 @@ static int vpif_querycap(struct file *file, void  *priv,
 {
         struct vpif_capture_config *config = vpif_dev->platform_data;
 
-        cap->version = VPIF_CAPTURE_VERSION_CODE;
         cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
         strlcpy(cap->driver, "vpif capture", sizeof(cap->driver));
         strlcpy(cap->bus_info, "DM646x Platform", sizeof(cap->bus_info));
@@ -2211,10 +2210,8 @@ static __init int vpif_probe(struct platform_device *pdev)
                 vfd->v4l2_dev = &vpif_obj.v4l2_dev;
                 vfd->release = video_device_release;
                 snprintf(vfd->name, sizeof(vfd->name),
-                         "DM646x_VPIFCapture_DRIVER_V%d.%d.%d",
-                         (VPIF_CAPTURE_VERSION_CODE >> 16) & 0xff,
-                         (VPIF_CAPTURE_VERSION_CODE >> 8) & 0xff,
-                         (VPIF_CAPTURE_VERSION_CODE) & 0xff);
+                         "DM646x_VPIFCapture_DRIVER_V%s",
+                         VPIF_CAPTURE_VERSION);
                 /* Set video_dev to the video device */
                 ch->video_dev = vfd;
         }
diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
index 7a4196dfdce1..064550f5ce4a 100644
--- a/drivers/media/video/davinci/vpif_capture.h
+++ b/drivers/media/video/davinci/vpif_capture.h
@@ -23,7 +23,6 @@
 
 /* Header files */
 #include <linux/videodev2.h>
-#include <linux/version.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
@@ -33,11 +32,7 @@
 #include "vpif.h"
 
 /* Macros */
-#define VPIF_MAJOR_RELEASE              0
-#define VPIF_MINOR_RELEASE              0
-#define VPIF_BUILD                      1
-#define VPIF_CAPTURE_VERSION_CODE       ((VPIF_MAJOR_RELEASE << 16) | \
-        (VPIF_MINOR_RELEASE << 8) | VPIF_BUILD)
+#define VPIF_CAPTURE_VERSION            "0.0.2"
 
 #define VPIF_VALID_FIELD(field)         (((V4L2_FIELD_ANY == field) || \
         (V4L2_FIELD_NONE == field)) || \
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index cdf659abdc2a..286f02910044 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -29,7 +29,6 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/version.h>
 #include <linux/slab.h>
 
 #include <asm/irq.h>
@@ -47,6 +46,7 @@
 
 MODULE_DESCRIPTION("TI DaVinci VPIF Display driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(VPIF_DISPLAY_VERSION);
 
 #define DM646X_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50)
 
@@ -701,7 +701,6 @@ static int vpif_querycap(struct file *file, void  *priv,
 {
         struct vpif_display_config *config = vpif_dev->platform_data;
 
-        cap->version = VPIF_DISPLAY_VERSION_CODE;
         cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
         strlcpy(cap->driver, "vpif display", sizeof(cap->driver));
         strlcpy(cap->bus_info, "Platform", sizeof(cap->bus_info));
@@ -1740,10 +1739,8 @@ static __init int vpif_probe(struct platform_device *pdev)
                 vfd->v4l2_dev = &vpif_obj.v4l2_dev;
                 vfd->release = video_device_release;
                 snprintf(vfd->name, sizeof(vfd->name),
-                         "DM646x_VPIFDisplay_DRIVER_V%d.%d.%d",
-                         (VPIF_DISPLAY_VERSION_CODE >> 16) & 0xff,
-                         (VPIF_DISPLAY_VERSION_CODE >> 8) & 0xff,
-                         (VPIF_DISPLAY_VERSION_CODE) & 0xff);
+                         "DM646x_VPIFDisplay_DRIVER_V%s",
+                         VPIF_DISPLAY_VERSION);
 
                 /* Set video_dev to the video device */
                 ch->video_dev = vfd;
diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
index b53aaa883075..5d1936dafed2 100644
--- a/drivers/media/video/davinci/vpif_display.h
+++ b/drivers/media/video/davinci/vpif_display.h
@@ -18,7 +18,6 @@
 
 /* Header files */
 #include <linux/videodev2.h>
-#include <linux/version.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
@@ -27,12 +26,7 @@
 #include "vpif.h"
 
 /* Macros */
-#define VPIF_MAJOR_RELEASE      (0)
-#define VPIF_MINOR_RELEASE      (0)
-#define VPIF_BUILD              (1)
-
-#define VPIF_DISPLAY_VERSION_CODE \
-        ((VPIF_MAJOR_RELEASE << 16) | (VPIF_MINOR_RELEASE << 8) | VPIF_BUILD)
+#define VPIF_DISPLAY_VERSION    "0.0.2"
 
 #define VPIF_VALID_FIELD(field) \
         (((V4L2_FIELD_ANY == field) || (V4L2_FIELD_NONE == field)) || \