* cx88-core.c, cx88-dvb.c, cx88-input.c:

	* lgdt3302.c, lgdt3302_priv.h, or51132.c:
	* saa7134-cards.c, saa7134-core.c:
	* saa7134-dvb.c, saa7134-i2c.c, saa7134-oss.c:
	* saa7134-tvaudio.c, saa7134-video.c:
	* tda8290.c, tea5767.c, tuner-simple.c:

	- Clean up ALL whitespace using
	  scripts/strip-trailing-whitespaces.sh

Signed-off-by: Michael Krufky <mkrufky@m1k.net>

13 files changed, 82 insertions, 82 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index 8054d279f..8ac8ffe68 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-core.c,v 1.31 2005/06/22 22:58:04 mchehab Exp $
+ * $Id: cx88-core.c,v 1.32 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * driver core
@@ -1185,7 +1185,7 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
 		core->radio_addr = cx88_boards[core->board].radio_addr;
 
         printk(KERN_INFO "TV tuner %d at 0x%02x, Radio tuner %d at 0x%02x\n",
-		core->tuner_type, core->tuner_addr<<1, 
+		core->tuner_type, core->tuner_addr<<1,
 		core->radio_type, core->radio_addr<<1);
 
 	core->tda9887_conf = cx88_boards[core->board].tda9887_conf;
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 0194b84fc..206c6a098 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.36 2005/06/21 06:08:12 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.37 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -187,7 +187,7 @@ static struct cx22702_config hauppauge_novat_config = {
 #endif
 
 #if HAVE_OR51132
-static int or51132_set_ts_param(struct dvb_frontend* fe, 
+static int or51132_set_ts_param(struct dvb_frontend* fe,
 				int is_punctured)
 {
 	struct cx8802_dev *dev= fe->dvb->priv;
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c
index 76d506db6..c669e9d06 100644
--- a/linux/drivers/media/video/cx88/cx88-input.c
+++ b/linux/drivers/media/video/cx88/cx88-input.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-input.c,v 1.13 2005/06/13 16:07:46 nsh Exp $
+ * $Id: cx88-input.c,v 1.14 2005/06/28 23:41:47 mkrufky Exp $
  *
  * Device driver for GPIO attached remote control interfaces
  * on Conexant 2388x based TV/DVB cards.
@@ -177,7 +177,7 @@ static IR_KEYTAB_TYPE ir_codes_adstech_dvb_t_pci[IR_KEYTAB_SIZE] = {
 
 /* MSI TV@nywhere remote */
 static IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE] = {
-       [ 0x00 ] = KEY_0,           /* '0' */          
+       [ 0x00 ] = KEY_0,           /* '0' */
        [ 0x01 ] = KEY_1,           /* '1' */
        [ 0x02 ] = KEY_2,           /* '2' */
        [ 0x03 ] = KEY_3,           /* '3' */
@@ -331,7 +331,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 	case CX88_BOARD_WINFAST2000XP_EXPERT:
 		ir_codes         = ir_codes_winfast;
 		ir->gpio_addr    = MO_GP0_IO;
-		ir->mask_keycode = 0x8f8; 
+		ir->mask_keycode = 0x8f8;
 		ir->mask_keyup   = 0x100;
 		ir->polling      = 1; // ms
 		break;
@@ -345,7 +345,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 	case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO:
 		ir_codes         = ir_codes_pixelview;
 		ir->gpio_addr    = MO_GP1_IO;
-		ir->mask_keycode = 0x1f; 
+		ir->mask_keycode = 0x1f;
 		ir->mask_keyup   = 0x80;
 		ir->polling      = 1; // ms
 		break;
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 1bb5ed381..b14c73be5 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-cards.c,v 1.74 2005/06/25 19:47:02 nsh Exp $
+ * $Id: saa7134-cards.c,v 1.75 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
@@ -49,7 +49,7 @@ struct saa7134_board saa7134_boards[] = {
 		.radio_type     = UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.radio_addr	= ADDR_UNSET,
-		
+
 		.inputs         = {{
 			.name = "default",
 			.vmux = 0,
@@ -64,7 +64,7 @@ struct saa7134_board saa7134_boards[] = {
 		.radio_type     = UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.radio_addr	= ADDR_UNSET,
-		
+
 		.inputs         = {{
 			.name = name_comp1,
 			.vmux = 0,
@@ -844,7 +844,7 @@ struct saa7134_board saa7134_boards[] = {
                 }},				/* radio and probably mute is missing */
         },
 	[SAA7134_BOARD_CRONOS_PLUS] = {
-		/* 
+		/*
 		   gpio pins:
 		   0  .. 3   BASE_ID
 		   4  .. 7   PROTECT_ID
@@ -951,7 +951,7 @@ struct saa7134_board saa7134_boards[] = {
 			.vmux = 1,
 			.amux = TV,
 			.tv   = 1,
-		
+
 		},{
 			.name = name_comp1,
 			.vmux = 4,
@@ -961,7 +961,7 @@ struct saa7134_board saa7134_boards[] = {
 			.vmux = 6,
 			.amux = LINE2,
                 }},
-		.radio = {                        
+		.radio = {
 			.name = name_radio,
 			.amux = LINE1,
 		},
@@ -1350,7 +1350,7 @@ struct saa7134_board saa7134_boards[] = {
 			.amux = LINE2_LEFT,
 			.tv   = 1,
 			.gpio = 0x00080,
-		}},		
+		}},
 		.radio = {
 			.name = name_radio,
 			.amux = LINE2,
@@ -1450,7 +1450,7 @@ struct saa7134_board saa7134_boards[] = {
 		}
 	},
         [SAA7134_BOARD_AVERMEDIA_STUDIO_307] = {
-		/* 
+		/*
 		Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 		Lots of thanks to Andrey Zolotarev <zolotarev_andrey@mail.ru>
 		*/
@@ -1824,7 +1824,7 @@ struct saa7134_board saa7134_boards[] = {
 	},
 	[SAA7134_BOARD_ADS_INSTANT_TV] = {
 		.name           = "ADS Tech Instant TV (saa7135)",
-		.audio_clock    = 0x00187de7,   
+		.audio_clock    = 0x00187de7,
 		.tuner_type     = TUNER_PHILIPS_TDA8290,
 		.radio_type     = UNSET,
 		.tuner_addr	= ADDR_UNSET,
@@ -1919,7 +1919,7 @@ struct saa7134_board saa7134_boards[] = {
 			.name = name_mute,
 			.amux = LINE1,
 		},
-	},  	
+	},
 	[SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII] = {
 		.name           = "Compro VideoMate TV Gold+II",
 		.audio_clock    = 0x002187de7,
@@ -1930,7 +1930,7 @@ struct saa7134_board saa7134_boards[] = {
 		.gpiomask       = 0x8c1880,
 		.inputs         = {{
 			.name = name_svideo,
-			.vmux = 0,      
+			.vmux = 0,
 			.amux = LINE1,
 			.gpio = 0x800800,
 		},{
@@ -1956,7 +1956,7 @@ struct saa7134_board saa7134_boards[] = {
 			.gpio = 0x840000,
 		},
 	},
-	[SAA7134_BOARD_KWORLD_XPERT] = {                
+	[SAA7134_BOARD_KWORLD_XPERT] = {
 		/*
 		  FIXME:
 		  - Remote control doesn't initialize properly.
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index 3f81aac46..8fed24e6a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-core.c,v 1.33 2005/06/20 22:06:52 mkrufky Exp $
+ * $Id: saa7134-core.c,v 1.34 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * driver core
@@ -999,7 +999,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 		struct i2c_msg msg[] = {{.addr=0x50, .flags=0, .buf=&subaddr, .len = 1},
 		                        {.addr=0x50, .flags=I2C_M_RD, .buf=data, .len = 3}};
         subaddr= 0x14;
-		tuner_t = 0;                     
+		tuner_t = 0;
 		ret = i2c_transfer(&dev->i2c_adap, msg, 2);
 		if (ret != 2) {
 			printk(KERN_ERR "EEPROM read failure\n");
@@ -1015,12 +1015,12 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 					dev->tuner_type = TUNER_PHILIPS_PAL;
 					break;
 				case 0x010C:
-					dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3;		
+					dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3;
 					break;
                 default:
 					printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t);
-            	}                               
-			} else {            
+            	}
+			} else {
 				if ((data[1] != 0) && (data[1] != 0xff)) {
 					/* Hac: new config structure */
 			    	subaddr = data[1] + 1;
@@ -1046,15 +1046,15 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 				}
         	}
 		}
-        printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type);        
-		saa7134_boards[SAA7134_BOARD_MD7134].tuner_type = dev->tuner_type;			
+        printk(KERN_INFO "%s Tuner type is %d\n", dev->name, dev->tuner_type);
+		saa7134_boards[SAA7134_BOARD_MD7134].tuner_type = dev->tuner_type;
 		if (dev->tuner_type == TUNER_PHILIPS_FMD1216ME_MK3) {
 			dev->tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE;
 			saa7134_boards[SAA7134_BOARD_MD7134].tda9887_conf = dev->tda9887_conf;
 			saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG, &dev->tda9887_conf);
 		}
 		saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&dev->tuner_type);
-	}		
+	}
 
 	/* initialize hardware #2 */
 	saa7134_board_init2(dev);
@@ -1063,7 +1063,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 	/* load i2c helpers */
 	if (TUNER_ABSENT != dev->tuner_type)
 		request_module("tuner");
-	if (dev->tda9887_conf) 
+	if (dev->tda9887_conf)
 		request_module("tda9887");
   	if (card_is_empress(dev)) {
 		request_module("saa6752hs");
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 3bb6ff17e..16b1e82c6 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-dvb.c,v 1.16 2005/06/21 20:42:53 hhackmann Exp $
+ * $Id: saa7134-dvb.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
  *
@@ -358,11 +358,11 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
 		}
 		mode = 7;
 		cp   = 1;
-	
+
 	}
 	/* calculate divisor */
 	/* ((36166000 + Finput) / 166666) rounded! */
-	divider = (tuner_frequency + 83333) / 166667;	
+	divider = (tuner_frequency + 83333) / 166667;
 
 	/* setup tuner buffer */
 	tuner_buf[0] = (divider >> 8) & 0x7f;
@@ -375,9 +375,9 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
 	return 0;
 }
 
-	
+
 static struct tda1004x_config medion_cardbus = {
-	.demod_address = 0x08,  
+	.demod_address = 0x08,
 	.invert        = 1,
 	.invert_oclk   = 0,
 	.xtal_freq     = TDA10046_XTAL_16M,
@@ -465,14 +465,14 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
 		if(tda827x_dvbt[i + 1].lomax == 0)
 			break;
 		i++;
-	}	
+	}
 
 	N = ((tuner_freq + 125000) / 250000) << (tda827x_dvbt[i].spd + 2);
 	tuner_buf[0] = 0;
 	tuner_buf[1] = (N>>8) | 0x40;
 	tuner_buf[2] = N & 0xff;
 	tuner_buf[3] = 0;
-	tuner_buf[4] = 0x52;  
+	tuner_buf[4] = 0x52;
 	tuner_buf[5] = (tda827x_dvbt[i].spd << 6) + (tda827x_dvbt[i].div1p5 << 5) +
 				   (tda827x_dvbt[i].bs << 3) + tda827x_dvbt[i].bp;
 	tuner_buf[6] = (tda827x_dvbt[i].gc3 << 4) + 0x8f;
@@ -487,7 +487,7 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
 	tuner_msg.len = 14;
 	if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
 		return -EIO;
-  
+
 	msleep(500);
 	/* correct CP value */
 	tuner_buf[0] = 0x30;
@@ -508,7 +508,7 @@ static void philips_tda827x_pll_sleep(struct dvb_frontend *fe)
 }
 
 static struct tda1004x_config tda827x_lifeview_config = {
-	.demod_address = 0x08,  
+	.demod_address = 0x08,
 	.invert        = 1,
 	.invert_oclk   = 0,
 	.xtal_freq     = TDA10046_XTAL_16M,
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index a7038361e..abb8a75fd 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-i2c.c,v 1.13 2005/06/28 03:17:39 mchehab Exp $
+ * $Id: saa7134-i2c.c,v 1.14 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * i2c interface support
@@ -347,7 +347,7 @@ static int attach_inform(struct i2c_client *client)
         tun_addr.type = saa7134_boards[dev->board].tuner_type;
         tun_addr.addr = saa7134_boards[dev->board].tuner_addr;
 
-	if (tun_addr.addr != ADDR_UNSET) 
+	if (tun_addr.addr != ADDR_UNSET)
 	    saa7134_i2c_call_clients(dev,TUNER_SET_TYPE_ADDR,&tun_addr);
 	else
 	    saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&tuner);
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c
index 7d1a1961f..b5bede95d 100644
--- a/linux/drivers/media/video/saa7134/saa7134-oss.c
+++ b/linux/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-oss.c,v 1.16 2005/06/14 19:12:45 hhackmann Exp $
+ * $Id: saa7134-oss.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * oss dsp interface
@@ -164,7 +164,7 @@ static int dsp_rec_start(struct saa7134_dev *dev)
 		saa_writeb(SAA7134_NUM_SAMPLES1, ((dev->oss.blksize - 1) & 0x00ff00) >>  8);
 		saa_writeb(SAA7134_NUM_SAMPLES2, ((dev->oss.blksize - 1) & 0xff0000) >> 16);
 		saa_writeb(SAA7134_AUDIO_FORMAT_CTRL, fmt);
-		
+
 		break;
 	case PCI_DEVICE_ID_PHILIPS_SAA7133:
 	case PCI_DEVICE_ID_PHILIPS_SAA7135:
@@ -577,7 +577,7 @@ mixer_recsrc_7133(struct saa7134_dev *dev)
 	saa_dsp_writel(dev, 0x46c >> 2, 0xbbbb10);
 	saa_dsp_writel(dev, 0x464 >> 2, xbarin);
 	saa_writel(0x594 >> 2, anabar);
-	    
+
 	return 0;
 }
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
index 692190e25..b320e06f8 100644
--- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-tvaudio.c,v 1.29 2005/06/22 22:31:38 nsh Exp $
+ * $Id: saa7134-tvaudio.c,v 1.30 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * tv audio decoder (fm stereo, nicam, ...)
@@ -220,7 +220,7 @@ static void mute_input_7134(struct saa7134_dev *dev)
 	mute = (dev->ctl_mute ||
 		(dev->automute  &&  (&card(dev).radio) != in));
 	if (card(dev).mute.name) {
-		/* 
+		/*
 		 * 7130 - we'll mute using some unconnected audio input
 		 * 7134 - we'll probably should switch external mux with gpio
 		 */
@@ -259,7 +259,7 @@ static void mute_input_7134(struct saa7134_dev *dev)
 		saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, 0x00);
 	else
 		saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, 0x01);
-	
+
 	/* switch gpio-connected external audio mux */
 	if (0 == card(dev).gpiomask)
 		return;
@@ -451,9 +451,9 @@ static int tvaudio_getstereo(struct saa7134_dev *dev, struct saa7134_tvaudio *au
 		if (nicam & 0x1) {
 			nicam_status = saa_readb(SAA7134_NICAM_STATUS);
 			dprintk("getstereo: nicam_status=0x%x\n", nicam_status);
-			
+
 			switch (nicam_status & 0x03) {
-			    case 0x01:			
+			    case 0x01:
 				retval = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
 				break;
 			    case 0x02:
@@ -807,9 +807,9 @@ static int mute_input_7133(struct saa7134_dev *dev)
 
 		if (card(dev).mute.name && dev->ctl_mute)
 			in = &card(dev).mute;
-		else 
+		else
 			in = dev->input;
-			
+
         	saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
         	saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
         	saa7134_track_gpio(dev,in->name);
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c
index d9ee6cb02..9a1d0a13e 100644
--- a/linux/drivers/media/video/saa7134/saa7134-video.c
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-video.c,v 1.35 2005/06/16 21:20:44 hhackmann Exp $
+ * $Id: saa7134-video.c,v 1.36 2005/06/28 23:41:47 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -280,7 +280,7 @@ static struct saa7134_tvnorm tvnorms[] = {
   		.vbi_v_stop_0  = 21,
   		.vbi_v_start_1 = 273,
   		.src_timing    = 7,
-		
+
 		.sync_control  = 0x18,
 		.luma_control  = 0x40,
 		.chroma_ctrl1  = 0x81,
@@ -1219,7 +1219,7 @@ static int video_open(struct inode *inode, struct file *file)
 	}
 	if (NULL == dev)
 		return -ENODEV;
-		
+
 	dprintk("open minor=%d radio=%d type=%s\n",minor,radio,
 		v4l2_type_names[type]);
 
@@ -1377,7 +1377,7 @@ static int video_release(struct inode *inode, struct file *file)
 		ret = i2c_transfer(&dev->i2c_adap, &msg, 1);
 		if (ret != 1)
 			printk(KERN_ERR "TDA8290 access failure\n");
-		msg.addr = I2C_ADDR_TDA8275; 
+		msg.addr = I2C_ADDR_TDA8275;
 		data[0] = 0x30;
 		data[1] = 0xd0;
 		ret = i2c_transfer(&dev->i2c_adap, &msg, 1);
@@ -1391,7 +1391,7 @@ static int video_release(struct inode *inode, struct file *file)
 		data[1] = 0x02;
 		i2c_transfer(&dev->i2c_adap, &msg, 1);
 	}
-	
+
 	/* free stuff */
 	videobuf_mmap_free(&fh->cap);
 	videobuf_mmap_free(&fh->vbi);
@@ -2160,7 +2160,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
 
 		if (0 != t->index)
 			return -EINVAL;
-			
+
 		saa7134_i2c_call_clients(dev,VIDIOC_S_TUNER,t);
 
 		return 0;
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c
index 2256baeab..44ea3c1e9 100644
--- a/linux/drivers/media/video/tda8290.c
+++ b/linux/drivers/media/video/tda8290.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tda8290.c,v 1.12 2005/06/26 14:03:48 nsh Exp $
+ * $Id: tda8290.c,v 1.13 2005/06/28 23:41:47 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * controls the philips tda8290+75 tuner chip combo.
@@ -138,14 +138,14 @@ static int tda8290_tune(struct i2c_client *c)
 }
 
 static void set_frequency(struct tuner *t, u16 ifc, unsigned int freq)
-{	
+{
 	u32 N;
 
 	if (t->mode == V4L2_TUNER_RADIO)
 		freq = freq / 1000;
 
 	N = (((freq<<3)+ifc)&0x3fffc);
-	
+
 	N = N >> get_freq_entry(div_table, freq);
 	t->i2c_set_freq[0] = 0;
 	t->i2c_set_freq[1] = (unsigned char)(N>>8);
@@ -200,12 +200,12 @@ static int has_signal(struct i2c_client *c)
 {
 	unsigned char i2c_get_afc[1] = { 0x1B };
 	unsigned char afc = 0;
-	
+
 	i2c_master_send(c, i2c_get_afc, ARRAY_SIZE(i2c_get_afc));
 	i2c_master_recv(c, &afc, 1);
 	return (afc & 0x80)? 65535:0;
 }
-	
+
 int tda8290_init(struct i2c_client *c)
 {
 	struct tuner *t = i2c_get_clientdata(c);
diff --git a/linux/drivers/media/video/tea5767.c b/linux/drivers/media/video/tea5767.c
index fb0e1616a..4f28fead0 100644
--- a/linux/drivers/media/video/tea5767.c
+++ b/linux/drivers/media/video/tea5767.c
@@ -2,7 +2,7 @@
  * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
  * I2C address is allways 0xC0.
  *
- * $Id: tea5767.c,v 1.11 2005/06/21 15:40:33 mchehab Exp $
+ * $Id: tea5767.c,v 1.12 2005/06/28 23:41:47 mkrufky Exp $
  *
  * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
  * This code is placed under the terms of the GNU General Public License
@@ -53,10 +53,10 @@ extern unsigned int tuner_debug;
 /* Third register */
 
 /* Station search from botton to up */
-#define TEA5767_SEARCH_UP	0x80 
+#define TEA5767_SEARCH_UP	0x80
 
 /* Searches with ADC output = 10 */
-#define TEA5767_SRCH_HIGH_LVL	0x60 
+#define TEA5767_SRCH_HIGH_LVL	0x60
 
 /* Searches with ADC output = 10 */
 #define TEA5767_SRCH_MID_LVL	0x40
@@ -68,7 +68,7 @@ extern unsigned int tuner_debug;
 #define TEA5767_HIGH_LO_INJECT	0x10
 
 /* Disable stereo */
-#define TEA5767_MONO		0x08 
+#define TEA5767_MONO		0x08
 
 /* Disable right channel and turns to mono */
 #define TEA5767_MUTE_RIGHT	0x04
@@ -84,7 +84,7 @@ extern unsigned int tuner_debug;
 #define TEA5767_STDBY		0x40
 
 /* Japan freq (76-108 MHz. If disabled, 87.5-108 MHz */
-#define TEA5767_JAPAN_BAND	0x20 
+#define TEA5767_JAPAN_BAND	0x20
 
 /* Unselected means 32.768 KHz freq as reference. Otherwise Xtal at 13 MHz */
 #define TEA5767_XTAL_32768	0x10
@@ -147,12 +147,12 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
 static void tea5767_status_dump(unsigned char *buffer)
 {
 	unsigned int div, frq;
-	
+
 	if (TEA5767_READY_FLAG_MASK & buffer[0])
 		printk(PREFIX "Ready Flag ON\n");
 	else
 		printk(PREFIX "Ready Flag OFF\n");
-	
+
 	if (TEA5767_BAND_LIMIT_MASK & buffer[0])
 		printk(PREFIX "Tuner at band limit\n");
 	else
@@ -177,7 +177,7 @@ static void tea5767_status_dump(unsigned char *buffer)
 	}
         buffer[0] = (div>>8) & 0x3f;
         buffer[1] = div      & 0xff;
-	
+
 	printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
 						frq/1000,frq%1000,div);
 
@@ -187,7 +187,7 @@ static void tea5767_status_dump(unsigned char *buffer)
 		printk(PREFIX "Mono\n");
 
 	printk(PREFIX "IF Counter = %d\n",buffer[2] & TEA5767_IF_CNTR_MASK);
-	
+
 	printk(PREFIX "ADC Level = %d\n",(buffer[3] & TEA5767_ADC_LEVEL_MASK)>>4);
 
 	printk(PREFIX "Chip ID = %d\n",(buffer[3] & TEA5767_CHIP_ID_MASK));
@@ -228,7 +228,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 		break;
 	case TEA5767_LOW_LO_13MHz:
 		tuner_dbg("TEA5767 radio LOW LO inject xtal @ 13 MHz\n");
-		
+
 		buffer[4] |= TEA5767_PLLREF_ENABLE;
 		div = (frq*4/16-700-225+25)/50;
 		break;
@@ -241,7 +241,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 	case TEA5767_HIGH_LO_32768:
 	default:
 		tuner_dbg("TEA5767 radio HIGH LO inject xtal @ 32,768 MHz\n");
-		
+
 		buffer[2] |= TEA5767_HIGH_LO_INJECT;
 		buffer[3] |= TEA5767_XTAL_32768;
 		div = (1000*(frq*4/16+700+225)+16384)>>15;
@@ -266,7 +266,7 @@ static int tea5767_signal(struct i2c_client *c)
 	memset(buffer,0,sizeof(buffer));
         if (5 != (rc = i2c_master_recv(c,buffer,5)))
                 tuner_warn ( "i2c i/o error: rc == %d (should be 5)\n",rc);
-		
+
 	return ((buffer[3] & TEA5767_ADC_LEVEL_MASK) <<(13-4));
 }
 
@@ -279,12 +279,12 @@ static int tea5767_stereo(struct i2c_client *c)
 	memset(buffer,0,sizeof(buffer));
         if (5 != (rc = i2c_master_recv(c,buffer,5)))
                 tuner_warn ( "i2c i/o error: rc == %d (should be 5)\n",rc);
-	
+
 	rc = buffer[2] & TEA5767_STEREO_MASK;
 
 	if ( tuner_debug )
 		tuner_dbg("TEA5767 radio ST GET = %02x\n", rc);
-	
+
 	return ( (buffer[2] & TEA5767_STEREO_MASK) ? V4L2_TUNER_SUB_STEREO: 0);
 }
 
@@ -300,7 +300,7 @@ int tea_detection(struct i2c_client *c)
 	}
 
 	/* If all bytes are the same then it's a TV tuner and not a tea5767 chip. */
-	if (buffer[0] == buffer[1] &&  buffer[0] == buffer[2] && 
+	if (buffer[0] == buffer[1] &&  buffer[0] == buffer[2] &&
 	    buffer[0] == buffer[3] &&  buffer[0] == buffer[4]) {
                 tuner_warn ( "All bytes are equal. It is not a TEA5767\n" );
 		return EINVAL;
@@ -309,7 +309,7 @@ int tea_detection(struct i2c_client *c)
 	/*  Status bytes:
 	 *  Byte 4: bit 3:1 : CI (Chip Identification) == 0
 	 *	    bit 0   : internally set to 0
-	 *  Byte 5: bit 7:0 : == 0 
+	 *  Byte 5: bit 7:0 : == 0
 	 */
 
 	if (!((buffer[3] & 0x0f) == 0x00) && (buffer[4] == 0x00)) {
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index 138b0128a..c15b00f30 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-simple.c,v 1.34 2005/06/28 03:17:39 mchehab Exp $
+ * $Id: tuner-simple.c,v 1.35 2005/06/28 23:41:47 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
@@ -259,9 +259,9 @@ static int tuner_stereo(struct i2c_client *c)
 {
 	int stereo, status;
 	struct tuner *t = i2c_get_clientdata(c);
-	
+
 	status = tuner_getstatus (c);
-	
+
 	switch (t->type) {
         	case TUNER_PHILIPS_FM1216ME_MK3:
     		case TUNER_PHILIPS_FM1236_MK3:
@@ -271,7 +271,7 @@ static int tuner_stereo(struct i2c_client *c)
 		default:
 			stereo = status & TUNER_STEREO;
 	}
-	
+
 	return stereo;
 }
 
@@ -493,7 +493,7 @@ int default_tuner_init(struct i2c_client *c)
 	tuner_info("type set to %d (%s)\n",
 		   t->type, tuners[t->type].name);
 	strlcpy(c->name, tuners[t->type].name, sizeof(c->name));
-	
+
 	t->tv_freq    = default_set_tv_freq;
 	t->radio_freq = default_set_radio_freq;
 	t->has_signal = tuner_signal;