Commit 64dc3c1a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] Stop using linux/version.h on the remaining video drivers 



Standardize the remaining video drivers to return the API version
for the VIDIOC_QUERYCAP version, instead of a per-driver version.

Those drivers had the version updated more recently or are SoC
drivers. Even so, it doesn't sound a good idea to keep a per-driver
version control, so, let's use the per-subsystem version control
instead.

Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b0eaab76

drivers/media/video/davinci/vpif_capture.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

	}

drivers/media/video/davinci/vpif_capture.h

+1 −6
Original line number Diff line number Diff line
@@ -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)) || \

drivers/media/video/davinci/vpif_display.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/davinci/vpif_display.h

+1 −7
Original line number Diff line number Diff line
@@ -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)) || \

drivers/media/video/fsl-viu.c

+2 −8
Original line number Diff line number Diff line
@@ -23,19 +23,13 @@ 
#include <linux/io.h>

#include <linux/of_platform.h>

#include <linux/slab.h>

#include <linux/version.h>

#include <media/v4l2-common.h>

#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>

#include <media/videobuf-dma-contig.h>



#define DRV_NAME		"fsl_viu"

#define VIU_MAJOR_VERSION	0

#define VIU_MINOR_VERSION	5

#define VIU_RELEASE		0

#define VIU_VERSION		KERNEL_VERSION(VIU_MAJOR_VERSION, \

					       VIU_MINOR_VERSION, \

					       VIU_RELEASE)

#define VIU_VERSION		"0.5.1"



#define BUFFER_TIMEOUT		msecs_to_jiffies(500)  /* 0.5 seconds */
@@ -610,7 +604,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
{

	strcpy(cap->driver, "viu");

	strcpy(cap->card, "viu");

	cap->version = VIU_VERSION;

	cap->capabilities =	V4L2_CAP_VIDEO_CAPTURE |

				V4L2_CAP_STREAMING     |

				V4L2_CAP_VIDEO_OVERLAY |
@@ -1684,3 +1677,4 @@ module_exit(viu_exit); 
MODULE_DESCRIPTION("Freescale Video-In(VIU)");

MODULE_AUTHOR("Hongjun Chen");

MODULE_LICENSE("GPL");

MODULE_VERSION(VIU_VERSION);