X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fradio%2Fradio-rtrack2.c;h=28a47c9e7a819a4791d122d02380ca12e46ffd40;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=5b68ac4c7322e710c112bb787a996ef621f48e04;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 5b68ac4c7..28a47c9e7 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -1,5 +1,5 @@
 /* RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff
- *
+ * 
  * Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood
  * Converted to new API by Alan Cox <Alan.Cox@linux.org>
  * Various bugfixes and enhancements by Russell Kroll <rkroll@exploits.org>
@@ -15,7 +15,6 @@
 #include <asm/io.h>		/* outb, outb_p			*/
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
-#include <media/v4l2-common.h>
 #include <linux/config.h>	/* CONFIG_RADIO_RTRACK2_PORT 	*/
 #include <linux/spinlock.h>
 
@@ -23,7 +22,7 @@
 #define CONFIG_RADIO_RTRACK2_PORT -1
 #endif
 
-static int io = CONFIG_RADIO_RTRACK2_PORT;
+static int io = CONFIG_RADIO_RTRACK2_PORT; 
 static int radio_nr = -1;
 static spinlock_t lock;
 
@@ -39,7 +38,7 @@ struct rt_device
 
 static void rt_mute(struct rt_device *dev)
 {
-	if(dev->muted)
+        if(dev->muted)
 		return;
 	spin_lock(&lock);
 	outb(1, io);
@@ -59,14 +58,14 @@ static void rt_unmute(struct rt_device *dev)
 
 static void zero(void)
 {
-	outb_p(1, io);
+        outb_p(1, io);
 	outb_p(3, io);
 	outb_p(1, io);
 }
 
 static void one(void)
 {
-	outb_p(5, io);
+        outb_p(5, io);
 	outb_p(7, io);
 	outb_p(5, io);
 }
@@ -76,7 +75,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)
 	int i;
 
 	freq = freq / 200 + 856;
-
+	
 	spin_lock(&lock);
 
 	outb_p(0xc8, io);
@@ -95,7 +94,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)
 	outb_p(0xc8, io);
 	if (!dev->muted)
 		outb_p(0, io);
-
+		
 	spin_unlock(&lock);
 	return 0;
 }
@@ -128,7 +127,7 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,
 		case VIDIOCGTUNER:
 		{
 			struct video_tuner *v = arg;
-			if(v->tuner)	/* Only 1 tuner */
+			if(v->tuner)	/* Only 1 tuner */ 
 				return -EINVAL;
 			v->rangelow=88*16000;
 			v->rangehigh=108*16000;
@@ -160,25 +159,25 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,
 			return 0;
 		}
 		case VIDIOCGAUDIO:
-		{
+		{	
 			struct video_audio *v = arg;
 			memset(v,0, sizeof(*v));
 			v->flags|=VIDEO_AUDIO_MUTABLE;
 			v->volume=1;
 			v->step=65535;
 			strcpy(v->name, "Radio");
-			return 0;
+			return 0;			
 		}
 		case VIDIOCSAUDIO:
 		{
 			struct video_audio *v = arg;
-			if(v->audio)
+			if(v->audio) 
 				return -EINVAL;
 
-			if(v->flags&VIDEO_AUDIO_MUTE)
+			if(v->flags&VIDEO_AUDIO_MUTE) 
 				rt_mute(rt);
 			else
-				rt_unmute(rt);
+			        rt_unmute(rt);
 
 			return 0;
 		}
@@ -220,7 +219,7 @@ static int __init rtrack2_init(void)
 		printk(KERN_ERR "You must set an I/O address with io=0x20c or io=0x30c\n");
 		return -EINVAL;
 	}
-	if (!request_region(io, 4, "rtrack2"))
+	if (!request_region(io, 4, "rtrack2")) 
 	{
 		printk(KERN_ERR "rtrack2: port 0x%x already in use\n", io);
 		return -EBUSY;
@@ -228,16 +227,16 @@ static int __init rtrack2_init(void)
 
 	rtrack2_radio.priv=&rtrack2_unit;
 
-	spin_lock_init(&lock);
+	spin_lock_init(&lock);	
 	if(video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr)==-1)
 	{
 		release_region(io, 4);
 		return -EINVAL;
 	}
-
+		
 	printk(KERN_INFO "AIMSlab Radiotrack II card driver.\n");
 
-	/* mute card - prevents noisy bootups */
+ 	/* mute card - prevents noisy bootups */
 	outb(1, io);
 	rtrack2_unit.muted = 1;