Commit 1990d50b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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



All the modified drivers didn't have any version increment since
Jan, 1 2011. Several of them didn't have any version increment
for a long time, even having new features and important bug fixes
happening.

As we're now filling the QUERYCAP version with the current Kernel
Release, we don't need to maintain a per-driver version control
anymore. So, let's just use the default.

In order to preserve the Kernel module version history, a
KERNEL_VERSION() macro were added to all modified drivers, and
the extraver number were incremented.

I opted to preserve the per-driver version control to a few
pwc, pvrusb2, s2255, s5p-fimc and sh_vou.

A few drivers are still using the legacy way to handle ioctl's.
So, we can't do such change on them, otherwise, they'll break.
Those are: uvc, et61x251 and sn9c102.

The rationale is that the per-driver version control seems to be
actively maintained on those.

Yet, I think that the better for them would be to just use the
default version numbering, instead of doing that by themselves.

While here, removed a few uneeded include linux/version.h

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

drivers/media/video/arv.c

+2 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/version.h>

#include <linux/videodev2.h>

#include <media/v4l2-common.h>

#include <media/v4l2-device.h>
@@ -54,7 +53,7 @@ 
 */

#define USE_INT		0	/* Don't modify */



#define VERSION	"0.04"

#define VERSION	"0.0.5"



#define ar_inl(addr) 		inl((unsigned long)(addr))

#define ar_outl(val, addr)	outl((unsigned long)(val), (unsigned long)(addr))
@@ -404,7 +403,6 @@ static int ar_querycap(struct file *file, void *priv, 
	strlcpy(vcap->driver, ar->vdev.name, sizeof(vcap->driver));

	strlcpy(vcap->card, "Colour AR VGA", sizeof(vcap->card));

	strlcpy(vcap->bus_info, "Platform", sizeof(vcap->bus_info));

	vcap->version = KERNEL_VERSION(0, 0, 4);

	vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;

	return 0;

}
@@ -879,3 +877,4 @@ module_exit(ar_cleanup_module); 
MODULE_AUTHOR("Takeo Takahashi <takahashi.takeo@renesas.com>");

MODULE_DESCRIPTION("Colour AR M64278(VGA) for Video4Linux");

MODULE_LICENSE("GPL");

MODULE_VERSION(VERSION);

drivers/media/video/au0828/au0828-core.c

+1 −0
Original line number Diff line number Diff line
@@ -292,3 +292,4 @@ module_exit(au0828_exit); 
MODULE_DESCRIPTION("Driver for Auvitek AU0828 based products");

MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");

MODULE_LICENSE("GPL");

MODULE_VERSION("0.0.2");

drivers/media/video/au0828/au0828-video.c

+0 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/init.h>

#include <linux/device.h>

#include <linux/suspend.h>

#include <linux/version.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-chip-ident.h>
@@ -43,8 +42,6 @@ 


static DEFINE_MUTEX(au0828_sysfs_lock);



#define AU0828_VERSION_CODE KERNEL_VERSION(0, 0, 1)



/* ------------------------------------------------------------------

	Videobuf operations

   ------------------------------------------------------------------*/
@@ -1254,8 +1251,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(cap->card, dev->board.name, sizeof(cap->card));

	strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info));



	cap->version = AU0828_VERSION_CODE;



	/*set the device capabilities */

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_VBI_CAPTURE |

drivers/media/video/bt8xx/bttv-driver.c

+4 −10
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 


#include <media/saa6588.h>



#define BTTV_VERSION "0.9.19"



unsigned int bttv_num;			/* number of Bt848s in use */

struct bttv *bttvs[BTTV_MAX];
@@ -163,6 +164,7 @@ MODULE_PARM_DESC(radio_nr, "radio device numbers"); 
MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards");

MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr");

MODULE_LICENSE("GPL");

MODULE_VERSION(BTTV_VERSION);



/* ----------------------------------------------------------------------- */

/* sysfs                                                                   */
@@ -2616,7 +2618,6 @@ static int bttv_querycap(struct file *file, void *priv, 
	strlcpy(cap->card, btv->video_dev->name, sizeof(cap->card));

	snprintf(cap->bus_info, sizeof(cap->bus_info),

		 "PCI:%s", pci_name(btv->c.pci));

	cap->version = BTTV_VERSION_CODE;

	cap->capabilities =

		V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_VBI_CAPTURE |
@@ -3416,7 +3417,6 @@ static int radio_querycap(struct file *file, void *priv, 
	strcpy(cap->driver, "bttv");

	strlcpy(cap->card, btv->radio_dev->name, sizeof(cap->card));

	sprintf(cap->bus_info, "PCI:%s", pci_name(btv->c.pci));

	cap->version = BTTV_VERSION_CODE;

	cap->capabilities = V4L2_CAP_TUNER;



	return 0;
@@ -4585,14 +4585,8 @@ static int __init bttv_init_module(void) 


	bttv_num = 0;



	printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n",

	       (BTTV_VERSION_CODE >> 16) & 0xff,

	       (BTTV_VERSION_CODE >> 8) & 0xff,

	       BTTV_VERSION_CODE & 0xff);

#ifdef SNAPSHOT

	printk(KERN_INFO "bttv: snapshot date %04d-%02d-%02d\n",

	       SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);

#endif

	printk(KERN_INFO "bttv: driver version %s loaded\n",

	       BTTV_VERSION);

	if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME)

		gbuffers = 2;

	if (gbufsize > BTTV_MAX_FBUF)

drivers/media/video/bt8xx/bttvp.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
#ifndef _BTTVP_H_

#define _BTTVP_H_



#include <linux/version.h>

#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,18)



#include <linux/types.h>

#include <linux/wait.h>

#include <linux/i2c.h>