Commit 3c2d464e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] ivtv,cx18: Use default version control for VIDIOC_QUERYCAP 



After discussing with Andy Walls on irc, we've agreed that this
is the best thing to do. No regressions will be introduced, as 3.x.y
is greater then the current versions for cx18 and ivtv.

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

drivers/media/video/cx18/cx18-driver.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#ifndef CX18_DRIVER_H

#define CX18_DRIVER_H



#include <linux/version.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

drivers/media/video/cx18/cx18-ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -469,7 +469,6 @@ static int cx18_querycap(struct file *file, void *fh, 
	strlcpy(vcap->card, cx->card_name, sizeof(vcap->card));

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

		 "PCI:%s", pci_name(cx->pci_dev));

	vcap->version = CX18_DRIVER_VERSION; 	    /* version */

	vcap->capabilities = cx->v4l2_cap; 	    /* capabilities */

	return 0;

}

drivers/media/video/cx18/cx18-version.h

+1 −7
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ 
#define CX18_VERSION_H



#define CX18_DRIVER_NAME "cx18"

#define CX18_DRIVER_VERSION_MAJOR 1

#define CX18_DRIVER_VERSION_MINOR 5

#define CX18_DRIVER_VERSION_PATCHLEVEL 0



#define CX18_VERSION __stringify(CX18_DRIVER_VERSION_MAJOR) "." __stringify(CX18_DRIVER_VERSION_MINOR) "." __stringify(CX18_DRIVER_VERSION_PATCHLEVEL)

#define CX18_DRIVER_VERSION KERNEL_VERSION(CX18_DRIVER_VERSION_MAJOR, \

	CX18_DRIVER_VERSION_MINOR, CX18_DRIVER_VERSION_PATCHLEVEL)

#define CX18_VERSION "1.5.1"



#endif

drivers/media/video/ivtv/ivtv-driver.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
 *                using information provided by Jiun-Kuei Jung @ AVerMedia.

 */



#include <linux/version.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/delay.h>

drivers/media/video/ivtv/ivtv-ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc 
	strlcpy(vcap->driver, IVTV_DRIVER_NAME, sizeof(vcap->driver));

	strlcpy(vcap->card, itv->card_name, sizeof(vcap->card));

	snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->pdev));

	vcap->version = IVTV_DRIVER_VERSION; 	    /* version */

	vcap->capabilities = itv->v4l2_cap; 	    /* capabilities */

	return 0;

}