Commit 29834c1a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 



Just like the video drivers, the right thing to do is to use
the per-subsystem version control.

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

drivers/media/radio/dsbr100.c

+2 −5
Original line number Diff line number Diff line
@@ -102,10 +102,7 @@ 
/*

 * Version Information

 */

#include <linux/version.h>	/* for KERNEL_VERSION MACRO	*/



#define DRIVER_VERSION "v0.46"

#define RADIO_VERSION KERNEL_VERSION(0, 4, 6)

#define DRIVER_VERSION "0.4.7"



#define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>"

#define DRIVER_DESC "D-Link DSB-R100 USB FM radio driver"
@@ -335,7 +332,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(v->driver, "dsbr100", sizeof(v->driver));

	strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card));

	usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info));

	v->version = RADIO_VERSION;

	v->capabilities = V4L2_CAP_TUNER;

	return 0;

}
@@ -647,3 +643,4 @@ module_exit (dsbr100_exit); 
MODULE_AUTHOR( DRIVER_AUTHOR );

MODULE_DESCRIPTION( DRIVER_DESC );

MODULE_LICENSE("GPL");

MODULE_VERSION(DRIVER_VERSION);

drivers/media/radio/radio-aimslab.c

+1 −4
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/ioport.h>	/* request_region		*/

#include <linux/delay.h>	/* msleep			*/

#include <linux/videodev2.h>	/* kernel radio structs		*/

#include <linux/version.h>	/* for KERNEL_VERSION MACRO	*/

#include <linux/io.h>		/* outb, outb_p			*/

#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>
@@ -41,6 +40,7 @@ 
MODULE_AUTHOR("M.Kirkwood");

MODULE_DESCRIPTION("A driver for the RadioTrack/RadioReveal radio card.");

MODULE_LICENSE("GPL");

MODULE_VERSION("0.0.3");



#ifndef CONFIG_RADIO_RTRACK_PORT

#define CONFIG_RADIO_RTRACK_PORT -1
@@ -53,8 +53,6 @@ module_param(io, int, 0); 
MODULE_PARM_DESC(io, "I/O address of the RadioTrack card (0x20f or 0x30f)");

module_param(radio_nr, int, 0);



#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)



struct rtrack

{

	struct v4l2_device v4l2_dev;
@@ -223,7 +221,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(v->driver, "radio-aimslab", sizeof(v->driver));

	strlcpy(v->card, "RadioTrack", sizeof(v->card));

	strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));

	v->version = RADIO_VERSION;

	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	return 0;

}

drivers/media/radio/radio-aztech.c

+1 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/ioport.h>	/* request_region		*/

#include <linux/delay.h>	/* udelay			*/

#include <linux/videodev2.h>	/* kernel radio structs		*/

#include <linux/version.h>      /* for KERNEL_VERSION MACRO     */

#include <linux/io.h>		/* outb, outb_p			*/

#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>
@@ -38,6 +37,7 @@ 
MODULE_AUTHOR("Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");

MODULE_DESCRIPTION("A driver for the Aztech radio card.");

MODULE_LICENSE("GPL");

MODULE_VERSION("0.0.3");



/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
@@ -53,8 +53,6 @@ module_param(io, int, 0); 
module_param(radio_nr, int, 0);

MODULE_PARM_DESC(io, "I/O address of the Aztech card (0x350 or 0x358)");



#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)



struct aztech

{

	struct v4l2_device v4l2_dev;
@@ -188,7 +186,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(v->driver, "radio-aztech", sizeof(v->driver));

	strlcpy(v->card, "Aztech Radio", sizeof(v->card));

	strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));

	v->version = RADIO_VERSION;

	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	return 0;

}

drivers/media/radio/radio-cadet.c

+1 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
 *		Changed API to V4L2

 */



#include <linux/version.h>

#include <linux/module.h>	/* Modules 			*/

#include <linux/init.h>		/* Initdata			*/

#include <linux/ioport.h>	/* request_region		*/
@@ -46,6 +45,7 @@ 
MODULE_AUTHOR("Fred Gleason, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");

MODULE_DESCRIPTION("A driver for the ADS Cadet AM/FM/RDS radio card.");

MODULE_LICENSE("GPL");

MODULE_VERSION("0.3.4");



static int io = -1;		/* default to isapnp activation */

static int radio_nr = -1;
@@ -54,8 +54,6 @@ module_param(io, int, 0); 
MODULE_PARM_DESC(io, "I/O address of Cadet card (0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e)");

module_param(radio_nr, int, 0);



#define CADET_VERSION KERNEL_VERSION(0, 3, 3)



#define RDS_BUFFER 256

#define RDS_RX_FLAG 1

#define MBS_RX_FLAG 2
@@ -361,7 +359,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(v->driver, "ADS Cadet", sizeof(v->driver));

	strlcpy(v->card, "ADS Cadet", sizeof(v->card));

	strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));

	v->version = CADET_VERSION;

	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO |

			  V4L2_CAP_READWRITE | V4L2_CAP_RDS_CAPTURE;

	return 0;

drivers/media/radio/radio-gemtek.c

+2 −5
Original line number Diff line number Diff line
@@ -21,21 +21,19 @@ 
#include <linux/ioport.h>	/* request_region		*/

#include <linux/delay.h>	/* udelay			*/

#include <linux/videodev2.h>	/* kernel radio structs		*/

#include <linux/version.h>	/* for KERNEL_VERSION MACRO	*/

#include <linux/mutex.h>

#include <linux/io.h>		/* outb, outb_p			*/

#include <media/v4l2-ioctl.h>

#include <media/v4l2-device.h>



#define RADIO_VERSION KERNEL_VERSION(0, 0, 3)



/*

 * Module info.

 */



MODULE_AUTHOR("Jonas Munsin, Pekka Seppnen <pexu@kapsi.fi>");

MODULE_AUTHOR("Jonas Munsin, Pekka Seppänen <pexu@kapsi.fi>");

MODULE_DESCRIPTION("A driver for the GemTek Radio card.");

MODULE_LICENSE("GPL");

MODULE_VERSION("0.0.4");



/*

 * Module params.
@@ -387,7 +385,6 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(v->driver, "radio-gemtek", sizeof(v->driver));

	strlcpy(v->card, "GemTek", sizeof(v->card));

	strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));

	v->version = RADIO_VERSION;

	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	return 0;

}