[PATCH] DVB whitespace cleanup

This is the DVB whitespace cleanup patch (the big one ;-).

I checked the whitespace-onlyness:

linux-2.6.11-bk9$ find drivers/media/common drivers/media/dvb -name "*.o" | xargs size >/tmp/1
linux-2.6.11-bk9$ cd -
linux-2.6.11-bk9.patched
linux-2.6.11-bk9.patched$ find drivers/media/common drivers/media/dvb -name "*.o" | xargs size >/tmp/2
linux-2.6.11-bk9.patched$ less /tmp/1
linux-2.6.11-bk9.patched$ less /tmp/2
linux-2.6.11-bk9.patched$ diff -us /tmp/1 /tmp/2
Files /tmp/1 and /tmp/2 are identical

DVB whitespace cleanups:

 o sync kernel and linuxtv.org CVS wrt whitespace
 o repair indentation damage
 o remove whitespace at eol
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/media/common/saa7146_core.c

@@ -202,7 +202,7 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt
 	int nr_pages = 0;
 	int i,p;
 
-	BUG_ON( 0 == sglen);
+	BUG_ON(0 == sglen);
 	BUG_ON(list->offset > PAGE_SIZE);
 
 	/* if we have a user buffer, the first page may not be
@@ -322,7 +322,7 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id, struct pt_regs *regs)
 static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent)
 {
 	struct saa7146_pci_extension_data *pci_ext = (struct saa7146_pci_extension_data *)ent->driver_data;
-	struct saa7146_extension* ext = pci_ext->ext;
+	struct saa7146_extension *ext = pci_ext->ext;
 	struct saa7146_dev *dev;
 	int err = -ENOMEM;
 
@@ -423,7 +423,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
 	INFO(("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x).\n", dev->mem, dev->revision, pci->irq, pci->subsystem_vendor, pci->subsystem_device));
 	dev->ext = ext;
 
-	pci_set_drvdata(pci,dev);
+	pci_set_drvdata(pci, dev);
 
         init_MUTEX(&dev->lock);
 	spin_lock_init(&dev->int_slock);
@@ -460,7 +460,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
 	return err;
 
 err_unprobe:
-	pci_set_drvdata(pci,NULL);
+	pci_set_drvdata(pci, NULL);
 err_free_i2c:
 	pci_free_consistent(pci, SAA7146_RPS_MEM, dev->d_i2c.cpu_addr,
 			    dev->d_i2c.dma_handle);

drivers/media/common/saa7146_hlp.c

@@ -688,6 +688,7 @@ void saa7146_write_out_dma(struct saa7146_dev* dev, int which, struct saa7146_vi
 	printk("vdma%d.num_line_byte: 0x%08x\n", which,vdma->num_line_byte);
 */
 }
+
 static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa7146_buf *buf)
 {
 	struct saa7146_vv *vv = dev->vv_data;
@@ -769,7 +770,6 @@ static int calc_planar_422(struct saa7146_vv *vv, struct saa7146_buf *buf, struc
 		vdma3->prot_addr	= buf->pt[2].offset;
 		vdma3->base_even	= ((vdma3->pitch/2)*height)+buf->pt[2].offset;
 		vdma3->base_odd		= vdma3->base_even - (vdma3->pitch/2);
-
 	} else {
 		vdma3->base_even	= buf->pt[2].offset;
 		vdma3->base_odd		= vdma3->base_even + (vdma3->pitch/2);
@@ -812,7 +812,6 @@ static int calc_planar_420(struct saa7146_vv *vv, struct saa7146_buf *buf, struc
 	return 0;
 }
 
-
 static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa7146_buf *buf)
 {
 	struct saa7146_vv *vv = dev->vv_data;
@@ -1035,4 +1034,3 @@ void saa7146_set_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, struc
 	/* turn on rps */
 	saa7146_write(dev, MC1, (MASK_12 | MASK_28));
 }
-

drivers/media/common/saa7146_vbi.c

@@ -154,6 +154,7 @@ static void saa7146_set_vbi_capture(struct saa7146_dev *dev, struct saa7146_buf
 	vdma3.pitch	= vbi_pixel_to_capture;
 	vdma3.base_page	= buf->pt[2].dma | ME1;
 	vdma3.num_line_byte = (16 << 16) | vbi_pixel_to_capture;
+
 	saa7146_write_out_dma(dev, 3, &vdma3);
 
 	/* write beginning of rps-program */
@@ -246,7 +247,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e
 		saa7146_pgtable_free(dev->pci, &buf->pt[2]);
 		saa7146_pgtable_alloc(dev->pci, &buf->pt[2]);
 
-		err = videobuf_iolock(dev->pci,&buf->vb,NULL);
+		err = videobuf_iolock(dev->pci,&buf->vb, NULL);
 		if (err)
 			goto oops;
 		err = saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen);

drivers/media/common/saa7146_video.c

@@ -820,7 +820,7 @@ static int video_end(struct saa7146_fh *fh, struct file *file)
 	if (vv->ov_suspend != NULL) {
 		saa7146_start_preview(vv->ov_suspend);
 		vv->ov_suspend = NULL;
-}
+	}
 
 	return 0;
 }
@@ -1006,10 +1006,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 		return get_control(fh,arg);
 	}
 	case VIDIOC_S_CTRL:
-
-
-
-
 	{
 		DEB_EE(("VIDIOC_S_CTRL\n"));
 		err = set_control(fh,arg);
@@ -1487,7 +1483,7 @@ static ssize_t video_read(struct file *file, char __user *data, size_t count, lo
 		goto out;
 	}
 
-	ret = videobuf_read_one(&fh->video_q, data, count, ppos,
+	ret = videobuf_read_one(&fh->video_q , data, count, ppos,
 				file->f_flags & O_NONBLOCK);
 	if (ret != 0) {
 		video_end(fh, file);

drivers/media/dvb/bt8xx/dvb-bt8xx.c

@@ -661,7 +661,7 @@ static int dvb_bt8xx_probe(struct device *dev)
 		kfree(card);
 		return -EFAULT;
 
-}
+	}
 
 	init_MUTEX(&card->bt->gpio_lock);
 	card->bt->bttv_nr = sub->core->nr;
@@ -694,7 +694,7 @@ static int dvb_bt8xx_remove(struct device *dev)
 	kfree(card);
 
 	return 0;
-	}
+}
 
 static struct bttv_sub_driver driver = {
 	.drv = {
@@ -721,7 +721,7 @@ static void __exit dvb_bt8xx_exit(void)
 
 module_init(dvb_bt8xx_init);
 module_exit(dvb_bt8xx_exit);
+
 MODULE_DESCRIPTION("Bt8xx based DVB adapter driver");
 MODULE_AUTHOR("Florian Schirmer <jolt@tuxbox.org>");
 MODULE_LICENSE("GPL");
-

drivers/media/dvb/cinergyT2/cinergyT2.c

@@ -37,13 +37,6 @@
 #include "dvb_net.h"
 
 
-
-
-
-
-
-
-
 #ifdef CONFIG_DVB_CINERGYT2_TUNING
 	#define STREAM_URB_COUNT (CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT)
 	#define STREAM_BUF_SIZE (CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE)
@@ -143,7 +136,7 @@ struct cinergyt2 {
 
 	void *streambuf;
 	dma_addr_t streambuf_dmahandle;
-	struct urb *stream_urb[STREAM_URB_COUNT];
+	struct urb *stream_urb [STREAM_URB_COUNT];
 
 #ifdef ENABLE_RC
 	struct input_dev rc_input_dev;
@@ -497,7 +490,7 @@ static int cinergyt2_open (struct inode *inode, struct file *file)
 	if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
 		cinergyt2_sleep(cinergyt2, 0);
 		schedule_delayed_work(&cinergyt2->query_work, HZ/2);
-}
+	}
 
 	up(&cinergyt2->sem);
 	return 0;
@@ -520,20 +513,20 @@ static int cinergyt2_release (struct inode *inode, struct file *file)
 	up(&cinergyt2->sem);
 
 	return dvb_generic_release(inode, file);
-	}
+}
 
 static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
-	{
+{
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
 	poll_wait(file, &cinergyt2->poll_wq, wait);
 	return (POLLIN | POLLRDNORM | POLLPRI);
-	}
+}
 
 
 static int cinergyt2_ioctl (struct inode *inode, struct file *file,
 		     unsigned cmd, unsigned long arg)
-	{
+{
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
 	struct dvbt_get_status_msg *stat = &cinergyt2->status;
@@ -878,7 +871,6 @@ static void cinergyt2_disconnect (struct usb_interface *intf)
 	dvb_net_release(&cinergyt2->dvbnet);
 	dvb_dmxdev_release(&cinergyt2->dmxdev);
 	dvb_dmx_release(&cinergyt2->demux);
-
 	dvb_unregister_device(cinergyt2->fedev);
 	dvb_unregister_adapter(cinergyt2->adapter);
 

drivers/media/dvb/dvb-core/demux.h

@@ -303,4 +303,3 @@ int dmx_unregister_demux (struct dmx_demux* demux);
 struct list_head* dmx_get_demuxes (void);
 
 #endif /* #ifndef __DEMUX_H */
-

drivers/media/dvb/dvb-core/dmxdev.c

@@ -992,6 +992,7 @@ static int dvb_demux_release(struct inode *inode, struct file *file)
 	return dvb_dmxdev_filter_free(dmxdev, dmxdevfilter);
 }
 
+
 static struct file_operations dvb_demux_fops = {
 	.owner		= THIS_MODULE,
 	.read		= dvb_demux_read,
@@ -1001,6 +1002,7 @@ static struct file_operations dvb_demux_fops = {
 	.poll		= dvb_demux_poll,
 };
 
+
 static struct dvb_device dvbdev_demux = {
 	.priv		= NULL,
 	.users		= 1,
@@ -1008,6 +1010,7 @@ static struct dvb_device dvbdev_demux = {
 	.fops		= &dvb_demux_fops
 };
 
+
 static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file,
 		     unsigned int cmd, void *parg)
 {
@@ -1032,6 +1035,7 @@ static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file,
 	return ret;
 }
 
+
 static int dvb_dvr_ioctl(struct inode *inode, struct file *file,
 		  unsigned int cmd, unsigned long arg)
 {
@@ -1084,7 +1088,7 @@ dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter)
 {
 	int i;
 
-	if (dmxdev->demux->open(dmxdev->demux)<0)
+	if (dmxdev->demux->open(dmxdev->demux) < 0)
 		return -EUSERS;
 
 	dmxdev->filter = vmalloc(dmxdev->filternum*sizeof(struct dmxdev_filter));
@@ -1109,6 +1113,7 @@ dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter)
 		dvb_dmxdev_filter_state_set(&dmxdev->filter[i], DMXDEV_STATE_FREE);
 		dvb_dmxdev_dvr_state_set(&dmxdev->dvr[i], DMXDEV_STATE_FREE);
 	}
+
 	dvb_register_device(dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev, DVB_DEVICE_DEMUX);
 	dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr, dmxdev, DVB_DEVICE_DVR);
 
@@ -1123,10 +1128,12 @@ dvb_dmxdev_release(struct dmxdev *dmxdev)
 {
 	dvb_unregister_device(dmxdev->dvbdev);
 	dvb_unregister_device(dmxdev->dvr_dvbdev);
+
 	if (dmxdev->filter) {
 		vfree(dmxdev->filter);
 		dmxdev->filter=NULL;
 	}
+
 	if (dmxdev->dvr) {
 		vfree(dmxdev->dvr);
 		dmxdev->dvr=NULL;
@@ -1134,4 +1141,3 @@ dvb_dmxdev_release(struct dmxdev *dmxdev)
 	dmxdev->demux->close(dmxdev->demux);
 }
 EXPORT_SYMBOL(dvb_dmxdev_release);
-

drivers/media/dvb/dvb-core/dvb_demux.h

@@ -147,4 +147,3 @@ int dvbdmx_connect_frontend(struct dmx_demux *demux, struct dmx_frontend *fronte
 int dvbdmx_disconnect_frontend(struct dmx_demux *demux);
 
 #endif /* _DVB_DEMUX_H_ */
-

drivers/media/dvb/dvb-core/dvb_filter.c

@@ -601,4 +601,3 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes,
 	return p2ts->cb(p2ts->priv, buf);
 }
 EXPORT_SYMBOL(dvb_filter_pes2ts);
-

drivers/media/dvb/dvb-core/dvb_filter.h

@@ -230,7 +230,7 @@ struct mpg_picture {
 };
 
 struct dvb_audio_info {
-	int layer               ;
+	int layer;
 	u32 bit_rate;
 	u32 frequency;
 	u32 mode;

drivers/media/dvb/dvb-core/dvb_frontend.c

@@ -206,7 +206,7 @@ static void dvb_frontend_init(struct dvb_frontend *fe)
 		fe->ops->init(fe);
 }
 
-static void update_delay (int *quality, int *delay, int min_delay, int locked)
+static void update_delay(int *quality, int *delay, int min_delay, int locked)
 {
 	    int q2;
 
@@ -355,7 +355,7 @@ static void dvb_frontend_wakeup(struct dvb_frontend *fe)
 /*
  * FIXME: use linux/kthread.h
  */
-static int dvb_frontend_thread (void *data)
+static int dvb_frontend_thread(void *data)
 {
 	struct dvb_frontend *fe = (struct dvb_frontend *) data;
 	struct dvb_frontend_private *fepriv = (struct dvb_frontend_private*) fe->frontend_priv;
@@ -365,17 +365,17 @@ static int dvb_frontend_thread (void *data)
 	fe_status_t s;
 	int check_wrapped = 0;
 
-	dprintk ("%s\n", __FUNCTION__);
+	dprintk("%s\n", __FUNCTION__);
 
 	snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num);
 
-        lock_kernel ();
-        daemonize (name);
-        sigfillset (&current->blocked);
-        unlock_kernel ();
+        lock_kernel();
+        daemonize(name);
+        sigfillset(&current->blocked);
+        unlock_kernel();
 
 	fepriv->status = 0;
-	dvb_frontend_init (fe);
+	dvb_frontend_init(fe);
 	fepriv->wakeup = 0;
 
 	while (1) {
@@ -384,7 +384,7 @@ static int dvb_frontend_thread (void *data)
 		timeout = wait_event_interruptible_timeout(fepriv->wait_queue,
 							   dvb_frontend_should_wakeup(fe),
 							   delay);
-		if (0 != dvb_frontend_is_exiting (fe)) {
+		if (0 != dvb_frontend_is_exiting(fe)) {
 			/* got signal or quitting */
 			break;
 		}
@@ -409,7 +409,7 @@ static int dvb_frontend_thread (void *data)
 			if (fe->ops->read_status)
 				fe->ops->read_status(fe, &s);
 			if (s != fepriv->status) {
-			dvb_frontend_add_event (fe, s);
+				dvb_frontend_add_event(fe, s);
 				fepriv->status = s;
 			}
 		}
@@ -592,8 +592,7 @@ static int dvb_frontend_start(struct dvb_frontend *fe)
 	return 0;
 }
 
-
-static int dvb_frontend_ioctl (struct inode *inode, struct file *file,
+static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
 			unsigned int cmd, void *parg)
 {
 	struct dvb_device *dvbdev = file->private_data;
@@ -768,7 +767,7 @@ static int dvb_frontend_ioctl (struct inode *inode, struct file *file,
 
 		fepriv->state = FESTATE_RETUNE;
 		dvb_frontend_wakeup(fe);
-		dvb_frontend_add_event (fe, 0);	    
+		dvb_frontend_add_event(fe, 0);
 		fepriv->status = 0;
 		err = 0;
 		break;
@@ -790,8 +789,7 @@ static int dvb_frontend_ioctl (struct inode *inode, struct file *file,
 	return err;
 }
 
-
-static unsigned int dvb_frontend_poll (struct file *file, struct poll_table_struct *wait)
+static unsigned int dvb_frontend_poll(struct file *file, struct poll_table_struct *wait)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct dvb_frontend *fe = dvbdev->priv;
@@ -807,8 +805,7 @@ static unsigned int dvb_frontend_poll (struct file *file, struct poll_table_stru
 	return 0;
 }
 
-
-static int dvb_frontend_open (struct inode *inode, struct file *file)
+static int dvb_frontend_open(struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct dvb_frontend *fe = dvbdev->priv;
@@ -832,8 +829,7 @@ static int dvb_frontend_open (struct inode *inode, struct file *file)
 	return ret;
 }
 
-
-static int dvb_frontend_release (struct inode *inode, struct file *file)
+static int dvb_frontend_release(struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct dvb_frontend *fe = dvbdev->priv;
@@ -847,7 +843,6 @@ static int dvb_frontend_release (struct inode *inode, struct file *file)
 	return dvb_generic_release (inode, file);
 }
 
-
 static struct file_operations dvb_frontend_fops = {
 	.owner		= THIS_MODULE,
 	.ioctl		= dvb_generic_ioctl,

drivers/media/dvb/dvb-core/dvb_net.c

@@ -989,12 +989,12 @@ static int dvb_net_feed_stop(struct net_device *dev)
 						__FUNCTION__, i);
 					priv->secfeed->release_filter(priv->secfeed,
 								      priv->multi_secfilter[i]);
-			priv->multi_secfilter[i]=NULL;
+					priv->multi_secfilter[i] = NULL;
 				}
 			}
 
 			priv->demux->release_section_feed(priv->demux, priv->secfeed);
-		priv->secfeed=NULL;
+			priv->secfeed = NULL;
 		} else
 			printk("%s: no feed to stop\n", dev->name);
 	} else if (priv->feedtype == DVB_NET_FEEDTYPE_ULE) {
@@ -1037,7 +1037,7 @@ static void wq_set_multicast_list (void *data)
 
 	priv->rx_mode = RX_MODE_UNI;
 
-	if(dev->flags & IFF_PROMISC) {
+	if (dev->flags & IFF_PROMISC) {
 		dprintk("%s: promiscuous mode\n", dev->name);
 		priv->rx_mode = RX_MODE_PROMISC;
 	} else if ((dev->flags & IFF_ALLMULTI)) {
@@ -1061,7 +1061,7 @@ static void wq_set_multicast_list (void *data)
 	}
 
 	dvb_net_feed_start(dev);
-	}
+}
 
 
 static void dvb_net_set_multicast_list (struct net_device *dev)
@@ -1119,7 +1119,6 @@ static struct net_device_stats * dvb_net_get_stats(struct net_device *dev)
         return &((struct dvb_net_priv*) dev->priv)->stats;
 }
 
-
 static void dvb_net_setup(struct net_device *dev)
 {
 	ether_setup(dev);
@@ -1133,7 +1132,6 @@ static void dvb_net_setup(struct net_device *dev)
 	dev->mtu		= 4096;
 	dev->mc_count           = 0;
 	dev->hard_header_cache  = NULL;
-
 	dev->flags |= IFF_NOARP;
 }
 
@@ -1205,7 +1203,6 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype)
 	return if_num;
 }
 
-
 static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num)
 {
 	struct net_device *net = dvbnet->device[num];
@@ -1228,7 +1225,6 @@ static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num)
 	return 0;
 }
 
-
 static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
 		  unsigned int cmd, void *parg)
 {
@@ -1269,6 +1265,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
 			return -EINVAL;
 
 		netdev = dvbnet->device[dvbnetif->if_num];
+
 		priv_data=(struct dvb_net_priv*)netdev->priv;
 		dvbnetif->pid=priv_data->pid;
 		dvbnetif->feedtype=priv_data->feedtype;
@@ -1319,6 +1316,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
 			return -EINVAL;
 
 		netdev = dvbnet->device[dvbnetif->if_num];
+
 		priv_data=(struct dvb_net_priv*)netdev->priv;
 		dvbnetif->pid=priv_data->pid;
 		break;

drivers/media/dvb/dvb-core/dvb_net.h

@@ -44,4 +44,3 @@ void dvb_net_release(struct dvb_net *);
 int  dvb_net_init(struct dvb_adapter *, struct dvb_net *, struct dmx_demux *);
 
 #endif
-

drivers/media/dvb/dvb-core/dvbdev.c

@@ -51,7 +51,6 @@ static const char * const dnames[] = {
 	"net", "osd"
 };
 
-
 #define DVB_MAX_IDS              6
 #define nums2minor(num,type,id)  ((num << 6) | (id << 4) | type)
 #define MAX_DVB_MINORS           (DVB_MAX_IDS*64)
@@ -111,7 +110,6 @@ static struct file_operations dvb_device_fops =
 	.open =		dvb_device_open,
 };
 
-
 static struct cdev dvb_device_cdev = {
 	.kobj   = {.name = "dvb", },
 	.owner  =       THIS_MODULE,
@@ -260,9 +258,9 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
 	class_simple_device_remove(MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
 					dvbdev->type, dvbdev->id)));
 
-		list_del(&dvbdev->list_head);
-		kfree(dvbdev);
-	}
+	list_del (&dvbdev->list_head);
+	kfree (dvbdev);
+}
 EXPORT_SYMBOL(dvb_unregister_device);
 
 
@@ -311,7 +309,6 @@ int dvb_register_adapter(struct dvb_adapter **padap, const char *name, struct mo
 	printk ("DVB: registering new adapter (%s).\n", name);
 
 	devfs_mk_dir("dvb/adapter%d", num);
-
 	adap->num = num;
 	adap->name = name;
 	adap->module = module;
@@ -451,4 +448,3 @@ module_exit(exit_dvbdev);
 MODULE_DESCRIPTION("DVB Core Driver");
 MODULE_AUTHOR("Marcus Metzler, Ralph Metzler, Holger Waechtler");
 MODULE_LICENSE("GPL");
-

drivers/media/dvb/dvb-core/dvbdev.h

@@ -58,9 +58,6 @@ struct dvb_adapter {
 struct dvb_device {
 	struct list_head list_head;
 	struct file_operations *fops;
- 
- 
- 
 	struct dvb_adapter *adapter;
 	int type;
 	u32 id;
@@ -105,4 +102,3 @@ extern int dvb_usercopy(struct inode *inode, struct file *file,
 			    unsigned int cmd, void *arg));
 
 #endif /* #ifndef _DVBDEV_H_ */
-

drivers/media/dvb/frontends/at76c651.c

@@ -150,7 +150,7 @@ static int at76c651_set_auto_config(struct at76c651_state *state)
 	if (state->revision == 0x11) {
 		at76c651_writereg(state, 0x2E, 0x38);
 		at76c651_writereg(state, 0x2F, 0x13);
-}
+	}
 
 	at76c651_disable_interrupts(state);
 
@@ -255,14 +255,6 @@ static int at76c651_set_inversion(struct at76c651_state* state, fe_spectral_inve
 	return at76c651_writereg(state, 0x60, feciqinv);
 }
 
-
-
-
-
-
-
-
-
 static int at76c651_set_parameters(struct dvb_frontend* fe,
 				   struct dvb_frontend_parameters *p)
 {
@@ -295,13 +287,13 @@ static int at76c651_set_defaults(struct dvb_frontend* fe)
 		at76c651_writereg(state, 0x0c, 0xc3);
 		state->config->pll_init(fe);
 		at76c651_writereg(state, 0x0c, 0xc2);
-}
+	}
 
 	return 0;
 }
 
 static int at76c651_read_status(struct dvb_frontend* fe, fe_status_t* status)
-		{
+{
 	struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
 	u8 sync;
 
@@ -313,24 +305,20 @@ static int at76c651_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 	if (sync & (0x04 | 0x10))	/* AGC1 || TIM */
 		*status |= FE_HAS_SIGNAL;
-
 	if (sync & 0x10)		/* TIM */
 		*status |= FE_HAS_CARRIER;
-
 	if (sync & 0x80)		/* FEC */
 		*status |= FE_HAS_VITERBI;
-
 	if (sync & 0x40)		/* CAR */
 		*status |= FE_HAS_SYNC;
-
 	if ((sync & 0xF0) == 0xF0)	/* TIM && EQU && CAR && FEC */
 		*status |= FE_HAS_LOCK;
 
 	return 0;
-		}
+}
 
 static int at76c651_read_ber(struct dvb_frontend* fe, u32* ber)
-		{
+{
 	struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
 
 	*ber = (at76c651_readreg(state, 0x81) & 0x0F) << 16;
@@ -339,10 +327,10 @@ static int at76c651_read_ber(struct dvb_frontend* fe, u32* ber)
 	*ber *= 10;
 
 	return 0;
-		}
+}
 
 static int at76c651_read_signal_strength(struct dvb_frontend* fe, u16* strength)
-		{
+{
 	struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
 
 	u8 gain = ~at76c651_readreg(state, 0x91);
@@ -359,12 +347,11 @@ static int at76c651_read_snr(struct dvb_frontend* fe, u16* snr)
 	    ((at76c651_readreg(state, 0x8F) << 8) |
 	     at76c651_readreg(state, 0x90));
 
-
 	return 0;
 }
 
 static int at76c651_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
-	{
+{
 	struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
 
 	*ucblocks = at76c651_readreg(state, 0x82);
@@ -378,13 +365,13 @@ static int at76c651_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronte
         fesettings->step_size = 0;
         fesettings->max_drift = 0;
 	return 0;
-	}
+}
 
 static void at76c651_release(struct dvb_frontend* fe)
 {
 	struct at76c651_state* state = (struct at76c651_state*) fe->demodulator_priv;
 	kfree(state);
-	}
+}
 
 static struct dvb_frontend_ops at76c651_ops;
 

drivers/media/dvb/frontends/cx22700.c

@@ -230,16 +230,6 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
 static int cx22700_init (struct dvb_frontend* fe)
 
 {	struct cx22700_state* state = (struct cx22700_state*) fe->demodulator_priv;

drivers/media/dvb/frontends/cx22702.c

@@ -186,7 +186,7 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet
 		case 1: p->guard_interval = GUARD_INTERVAL_1_16; break;
 		case 2: p->guard_interval =  GUARD_INTERVAL_1_8; break;
 		case 3: p->guard_interval =  GUARD_INTERVAL_1_4; break;
-}
+	}
 	switch( val&0x03 ) {
 		case 0: p->transmission_mode = TRANSMISSION_MODE_2K; break;
 		case 1: p->transmission_mode = TRANSMISSION_MODE_8K; break;
@@ -195,18 +195,6 @@ static int cx22702_get_tps (struct cx22702_state *state, struct dvb_ofdm_paramet
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 /* Talk to the demod, set the FEC, GUARD, QAM settings etc */
 static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
@@ -332,7 +320,6 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet
 	return 0;
 }
 
-
 /* Reset the demod hardware and reset all of the configuration registers
    to a default state. */
 static int cx22702_init (struct dvb_frontend* fe)
@@ -385,10 +372,10 @@ static int cx22702_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		*status |= FE_HAS_SIGNAL;
 
 	return 0;
-			}
+}
 
 static int cx22702_read_ber(struct dvb_frontend* fe, u32* ber)
-		{
+{
 	struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
 
 	if(cx22702_readreg (state, 0xE4) & 0x02) {
@@ -402,10 +389,10 @@ static int cx22702_read_ber(struct dvb_frontend* fe, u32* ber)
 	}
 
 	return 0;
-		}
+}
 
 static int cx22702_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
-		{
+{
 	struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
 
 	*signal_strength = cx22702_readreg (state, 0x23);
@@ -461,7 +448,7 @@ static void cx22702_release(struct dvb_frontend* fe)
 {
 	struct cx22702_state* state = (struct cx22702_state*) fe->demodulator_priv;
 	kfree(state);
-	}
+}
 
 static struct dvb_frontend_ops cx22702_ops;
 

drivers/media/dvb/frontends/cx24110.c

@@ -131,7 +131,6 @@ static int cx24110_writereg (struct cx24110_state* state, int reg, int data)
         return 0;
 }
 
-
 static int cx24110_readreg (struct cx24110_state* state, u8 reg)
 {
 	int ret;
@@ -181,7 +180,6 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver
 	return 0;
 }
 
-
 static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
 {
 /* fixme (low): error handling */
@@ -227,7 +225,6 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
 	return 0;
 }
 
-
 static fe_code_rate_t cx24110_get_fec (struct cx24110_state* state)
 {
 	int i;
@@ -244,7 +241,6 @@ static fe_code_rate_t cx24110_get_fec (struct cx24110_state* state)
 	}
 }
 
-
 static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
 {
 /* fixme (low): add error handling */
@@ -317,17 +313,6 @@ dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);
 
 }
 
-
-
-
-
-
-
-
-
-
-
-
 int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
 {
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
@@ -369,8 +354,6 @@ int cx24110_pll_write (struct dvb_frontend* fe, u32 data)
         return 0;
 }
 
-
-
 static int cx24110_initfe(struct dvb_frontend* fe)
 {
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
@@ -388,7 +371,6 @@ static int cx24110_initfe(struct dvb_frontend* fe)
 	return 0;
 }
 
-
 static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
@@ -447,13 +429,13 @@ static int cx24110_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		*status |= FE_HAS_LOCK;
 
 	return 0;
-	}
+}
 
 static int cx24110_read_ber(struct dvb_frontend* fe, u32* ber)
-	{
+{
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
 
-/* fixme (maybe): value range is 16 bit. Scale? */
+	/* fixme (maybe): value range is 16 bit. Scale? */
 	if(cx24110_readreg(state,0x24)&0x10) {
 		/* the Viterbi error counter has finished one counting window */
 		cx24110_writereg(state,0x24,0x04); /* select the ber reg */
@@ -465,10 +447,10 @@ static int cx24110_read_ber(struct dvb_frontend* fe, u32* ber)
 	*ber = state->lastber;
 
 	return 0;
-	}
+}
 
 static int cx24110_read_signal_strength(struct dvb_frontend* fe, u16* signal_strength)
-	{
+{
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
 
 /* no provision in hardware. Read the frontend AGC accumulator. No idea how to scale this, but I know it is 2s complement */
@@ -476,13 +458,13 @@ static int cx24110_read_signal_strength(struct dvb_frontend* fe, u16* signal_str
 	*signal_strength = (signal << 8) | signal;
 
 	return 0;
-	}
+}
 
 static int cx24110_read_snr(struct dvb_frontend* fe, u16* snr)
-	{
+{
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
 
-/* no provision in hardware. Can be computed from the Es/N0 estimator, but I don't know how. */
+	/* no provision in hardware. Can be computed from the Es/N0 estimator, but I don't know how. */
 	if(cx24110_readreg(state,0x6a)&0x80) {
 		/* the Es/N0 error counter has finished one counting window */
 		state->lastesn0=cx24110_readreg(state,0x69)|
@@ -492,10 +474,10 @@ static int cx24110_read_snr(struct dvb_frontend* fe, u16* snr)
 	*snr = state->lastesn0;
 
 	return 0;
-	}
+}
 
 static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
-	{
+{
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
 	u32 lastbyer;
 
@@ -517,7 +499,7 @@ static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 }
 
 static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
-        {
+{
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
 
 	state->config->pll_set(fe, p);
@@ -527,10 +509,10 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 	cx24110_writereg(state,0x04,0x05); /* start aquisition */
 
 	return 0;
-        }
+}
 
 static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
-	{
+{
 	struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
 	s32 afc; unsigned sclk;
 

drivers/media/dvb/frontends/dib3000mc.c

@@ -756,7 +756,7 @@ static int dib3000mc_set_frontend_and_tuner(struct dvb_frontend* fe, struct dvb_
 
 static void dib3000mc_release(struct dvb_frontend* fe)
 {
-	struct dib3000_state *state = (struct dib3000_state*) fe->demodulator_priv;
+	struct dib3000_state *state = (struct dib3000_state *) fe->demodulator_priv;
 	kfree(state);
 }
 

drivers/media/dvb/frontends/dvb_dummy_fe.c

@@ -27,16 +27,14 @@
 #include "dvb_dummy_fe.h"
 
 
-
 struct dvb_dummy_fe_state {
-
 	struct dvb_frontend_ops ops;
-
 	struct dvb_frontend frontend;
 };
 
+
 static int dvb_dummy_fe_read_status(struct dvb_frontend* fe, fe_status_t* status)
-	{
+{
 	*status = FE_HAS_SIGNAL
 		| FE_HAS_CARRIER
 		| FE_HAS_VITERBI
@@ -44,25 +42,25 @@ static int dvb_dummy_fe_read_status(struct dvb_frontend* fe, fe_status_t* status
 		| FE_HAS_LOCK;
 
 	return 0;
-	}
+}
 
 static int dvb_dummy_fe_read_ber(struct dvb_frontend* fe, u32* ber)
-	{
+{
 	*ber = 0;
 	return 0;
-	}
+}
 
 static int dvb_dummy_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)
-	{
+{
 	*strength = 0;
 	return 0;
-	}
+}
 
 static int dvb_dummy_fe_read_snr(struct dvb_frontend* fe, u16* snr)
-	{
+{
 	*snr = 0;
 	return 0;
-	}
+}
 
 static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
@@ -88,7 +86,7 @@ static int dvb_dummy_fe_sleep(struct dvb_frontend* fe)
 static int dvb_dummy_fe_init(struct dvb_frontend* fe)
 {
 	return 0;
-        }
+}
 
 static int dvb_dummy_fe_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {

drivers/media/dvb/frontends/l64781.c

@@ -32,13 +32,9 @@
 
 
 struct l64781_state {
-
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	const struct l64781_config* config;
-
 	struct dvb_frontend frontend;
 
 	/* private demodulator data */

drivers/media/dvb/frontends/mt312.c

@@ -36,14 +36,10 @@
 
 
 struct mt312_state {
-
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	/* configuration settings */
 	const struct mt312_config* config;
-
 	struct dvb_frontend frontend;
 
 	u8 id;
@@ -128,7 +124,7 @@ static int mt312_write(struct mt312_state* state, const enum mt312_reg_addr reg,
 }
 
 static inline int mt312_readreg(struct mt312_state* state,
-				const enum mt312_reg_addr reg, u8 * val)
+				const enum mt312_reg_addr reg, u8 *val)
 {
 	return mt312_read(state, reg, val, 1);
 }
@@ -206,7 +202,7 @@ static int mt312_get_symbol_rate(struct mt312_state* state, u32 *sr)
 		dprintk(KERN_DEBUG "*sr(manual) = %lu\n",
 		       (((MT312_PLL_CLK * 8192) / (sym_rat_op + 8192)) *
 			2) - dec_ratio);
-}
+	}
 
 	return 0;
 }
@@ -226,21 +222,7 @@ static int mt312_get_code_rate(struct mt312_state* state, fe_code_rate_t *cr)
 	*cr = fec_tab[(fec_status >> 4) & 0x07];
 
 	return 0;
-	}
-
-
-
-
-
-
-
-
-	
-
-
-
-
-
+}
 
 static int mt312_initfe(struct dvb_frontend* fe)
 {
@@ -614,12 +596,12 @@ static int mt312_sleep(struct dvb_frontend* fe)
 }
 
 static int mt312_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
-	{
+{
 	fesettings->min_delay_ms = 50;
 	fesettings->step_size = 0;
 	fesettings->max_drift = 0;
 	return 0;
-	}	    
+}
 
 static void mt312_release(struct dvb_frontend* fe)
 {
@@ -685,7 +667,7 @@ struct dvb_frontend* mt312_attach(const struct mt312_config* config,
 		goto error;
 	if (state->id != ID_MT312) {
 		goto error;
-}
+	}
 
 	/* create dvb_frontend */
 	state->frequency = 60;

drivers/media/dvb/frontends/mt352.c

@@ -53,9 +53,9 @@ struct mt352_state {
 
 static int debug;
 #define dprintk(args...) \
-do {									\
+	do { \
 		if (debug) printk(KERN_DEBUG "mt352: " args); \
-} while (0)
+	} while (0)
 
 static int mt352_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
 {
@@ -484,7 +484,7 @@ static int mt352_read_ber(struct dvb_frontend* fe, u32* ber)
 	       (mt352_read_register (state, RS_ERR_CNT_0));
 
 	return 0;
-	}
+}
 
 static int mt352_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
@@ -515,7 +515,7 @@ static int mt352_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 		    (mt352_read_register (state,  RS_UBC_0));
 
 	return 0;
-	}
+}
 
 static int mt352_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fe_tune_settings)
 {

drivers/media/dvb/frontends/nxt2002.c

@@ -251,7 +251,6 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
 	/* Get the RAM base for this nxt2002 */
 	i2c_readbytes(state,0x10,buf,1);
 
-	
 	if (buf[0] & 0x10)
 		rambase = 0x1000;
 	else
@@ -263,7 +262,6 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
 	buf[0] = 0x80;
 	i2c_writebytes(state,0x2B,buf,1);
 
-        
 	for (position = 0; position < fw->size ; position++) {
 		if (written == 0) {
 			crc = 0;
@@ -282,7 +280,6 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
 
 		crc = nxt2002_crc(crc,fw->data[position]);
 
-            
 		if ((written == 255) || (position+1 == fw->size)) {
 			/* write remaining bytes of firmware */
 			i2c_writebytes(state, chunkpos+4-(written %4),
@@ -309,7 +306,6 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
 	return 0;
 };
 
-
 static int nxt2002_setup_frontend_parameters (struct dvb_frontend* fe,
 					     struct dvb_frontend_parameters *p)
 {
@@ -505,7 +501,6 @@ static int nxt2002_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 	u8 b[3];
 
 	nxt2002_readreg_multibyte(state,0xE6,b,3);
-
 	*ucblocks = b[2];
 
 	return 0;

drivers/media/dvb/frontends/nxt6000.c

@@ -17,7 +17,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 */
 
 #include <linux/init.h>
@@ -33,16 +32,11 @@
 
 
 struct nxt6000_state {
-
-	struct i2c_adapter *i2c;
-
+	struct i2c_adapter* i2c;
 	struct dvb_frontend_ops ops;
-
 	/* configuration settings */
 	const struct nxt6000_config* config;
-
 	struct dvb_frontend frontend;
-
 };
 
 static int debug = 0;
@@ -50,7 +44,7 @@ static int debug = 0;
 
 static int nxt6000_writereg(struct nxt6000_state* state, u8 reg, u8 data)
 {
-	u8 buf[] = {reg, data};
+	u8 buf[] = { reg, data };
 	struct i2c_msg msg = {.addr = state->config->demod_address,.flags = 0,.buf = buf,.len = 2 };
 	int ret;
 
@@ -63,8 +57,8 @@ static int nxt6000_writereg(struct nxt6000_state* state, u8 reg, u8 data)
 static u8 nxt6000_readreg(struct nxt6000_state* state, u8 reg)
 {
 	int ret;
-	u8 b0[] = {reg};
-	u8 b1[] = {0};
+	u8 b0[] = { reg };
+	u8 b1[] = { 0 };
 	struct i2c_msg msgs[] = {
 		{.addr = state->config->demod_address,.flags = 0,.buf = b0,.len = 1},
 		{.addr = state->config->demod_address,.flags = I2C_M_RD,.buf = b1,.len = 1}
@@ -93,24 +87,18 @@ static int nxt6000_set_bandwidth(struct nxt6000_state* state, fe_bandwidth_t ban
 	u16 nominal_rate;
 	int result;
 
-	switch(bandwidth) {
+	switch (bandwidth) {
 
 	case BANDWIDTH_6_MHZ:
-		
 		nominal_rate = 0x55B7;
-			
 		break;
 
 	case BANDWIDTH_7_MHZ:
-
 		nominal_rate = 0x6400;
-			
 		break;
 
 	case BANDWIDTH_8_MHZ:
-
 		nominal_rate = 0x7249;
-			
 		break;
 
 	default:
@@ -125,7 +113,7 @@ static int nxt6000_set_bandwidth(struct nxt6000_state* state, fe_bandwidth_t ban
 
 static int nxt6000_set_guard_interval(struct nxt6000_state* state, fe_guard_interval_t guard_interval)
 {
-	switch(guard_interval) {
+	switch (guard_interval) {
 
 	case GUARD_INTERVAL_1_32:
 		return nxt6000_writereg(state, OFDM_COR_MODEGUARD, 0x00 | (nxt6000_readreg(state, OFDM_COR_MODEGUARD) & ~0x03));
@@ -147,7 +135,7 @@ static int nxt6000_set_guard_interval(struct nxt6000_state* state, fe_guard_inte
 
 static int nxt6000_set_inversion(struct nxt6000_state* state, fe_spectral_inversion_t inversion)
 {
-	switch(inversion) {
+	switch (inversion) {
 
 	case INVERSION_OFF:
 		return nxt6000_writereg(state, OFDM_ITB_CTL, 0x00);
@@ -165,7 +153,7 @@ static int nxt6000_set_transmission_mode(struct nxt6000_state* state, fe_transmi
 {
 	int result;
 
-	switch(transmission_mode) {
+	switch (transmission_mode) {
 
 	case TRANSMISSION_MODE_2K:
 		if ((result = nxt6000_writereg(state, EN_DMD_RACQ, 0x00 | (nxt6000_readreg(state, EN_DMD_RACQ) & ~0x03))) < 0)
@@ -249,24 +237,18 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 
 	printk(" VITERBI LOCK: %d,", (val >> 7) & 0x01);
 
-	switch((val >> 4) & 0x07) {
+	switch ((val >> 4) & 0x07) {
 
 	case 0x00:
-		
 		printk(" VITERBI CODERATE: 1/2,");
-			
 		break;
 
 	case 0x01:
-		
 		printk(" VITERBI CODERATE: 2/3,");
-			
 		break;
 
 	case 0x02:
-		
 		printk(" VITERBI CODERATE: 3/4,");
-			
 		break;
 
 	case 0x03:
@@ -278,7 +260,6 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 		break;
 
 	default:
-		
 		printk(" VITERBI CODERATE: Reserved,");
 
 	}
@@ -290,24 +271,18 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 	printk(" SYRLock: %d,", (val >> 5) & 0x01);
 	printk(" AGCLock: %d,", (val >> 4) & 0x01);
 
-	switch(val & 0x0F) {
+	switch (val & 0x0F) {
 
 	case 0x00:
-		
 		printk(" CoreState: IDLE,");
-			
 		break;
 
 	case 0x02:
-		
 		printk(" CoreState: WAIT_AGC,");
-			
 		break;
 
 	case 0x03:
-		
 		printk(" CoreState: WAIT_SYR,");
-			
 		break;
 
 	case 0x04:
@@ -319,19 +294,14 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 		break;
 
 	case 0x05:
-		
 		printk(" CoreState: WAIT_TPS,");
-			
 		break;
 
 	case 0x06:
-		
 		printk(" CoreState: MONITOR_TPS,");
-			
 		break;
 
 	default:
-		
 		printk(" CoreState: Reserved,");
 
 	}
@@ -341,24 +311,18 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 	printk(" SYRLock: %d,", (val >> 4) & 0x01);
 	printk(" SYRMode: %s,", (val >> 2) & 0x01 ? "8K" : "2K");
 
-	switch((val >> 4) & 0x03) {
+	switch ((val >> 4) & 0x03) {
 
 	case 0x00:
-		
 		printk(" SYRGuard: 1/32,");
-			
 		break;
 
 	case 0x01:
-		
 		printk(" SYRGuard: 1/16,");
-			
 		break;
 
 	case 0x02:
-		
 		printk(" SYRGuard: 1/8,");
-			
 		break;
 
 	case 0x03:
@@ -368,24 +332,18 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 
 	val = nxt6000_readreg(state, OFDM_TPS_RCVD_3);
 
-	switch((val >> 4) & 0x07) {
+	switch ((val >> 4) & 0x07) {
 
 	case 0x00:
-		
 		printk(" TPSLP: 1/2,");
-			
 		break;
 
 	case 0x01:
-		
 		printk(" TPSLP: 2/3,");
-			
 		break;
 
 	case 0x02:
-		
 		printk(" TPSLP: 3/4,");
-			
 		break;
 
 	case 0x03:
@@ -397,29 +355,22 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 		break;
 
 	default:
-		
 		printk(" TPSLP: Reserved,");
 
 	}
 
-	switch(val & 0x07) {
+	switch (val & 0x07) {
 
 	case 0x00:
-		
 		printk(" TPSHP: 1/2,");
-			
 		break;
 
 	case 0x01:
-		
 		printk(" TPSHP: 2/3,");
-			
 		break;
 
 	case 0x02:
-		
 		printk(" TPSHP: 3/4,");
-			
 		break;
 
 	case 0x03:
@@ -431,7 +382,6 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 		break;
 
 	default:
-		
 		printk(" TPSHP: Reserved,");
 
 	}
@@ -440,30 +390,22 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 
 	printk(" TPSMode: %s,", val & 0x01 ? "8K" : "2K");
 
-	switch((val >> 4) & 0x03) {
+	switch ((val >> 4) & 0x03) {
 
 	case 0x00:
-		
 		printk(" TPSGuard: 1/32,");
-			
 		break;
 
 	case 0x01:
-		
 		printk(" TPSGuard: 1/16,");
-			
 		break;
 
 	case 0x02:
-		
 		printk(" TPSGuard: 1/8,");
-			
 		break;
 
 	case 0x03:
-		
 		printk(" TPSGuard: 1/4,");
-			
 		break;
 
 	}
@@ -477,16 +419,6 @@ static void nxt6000_dump_status(struct nxt6000_state *state)
 	printk("\n");
 }
 
-
-
-
-
-
-
-
-
-
-
 static int nxt6000_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
 	u8 core_status;
@@ -515,21 +447,20 @@ static int nxt6000_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		nxt6000_dump_status(state);
 
 	return 0;
-		}
+}
 
 static int nxt6000_init(struct dvb_frontend* fe)
-		{
+{
 	struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
 
 	nxt6000_reset(state);
 	nxt6000_setup(fe);
 
 	return 0;
-		}
-	
+}
 
 static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *param)
-		{
+{
 	struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
 	int result;
 
@@ -549,12 +480,11 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 	return 0;
 }
 
-
 static void nxt6000_release(struct dvb_frontend* fe)
 {
 	struct nxt6000_state* state = (struct nxt6000_state*) fe->demodulator_priv;
 	kfree(state);
-	}
+}
 
 static struct dvb_frontend_ops nxt6000_ops;
 
@@ -583,7 +513,7 @@ struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
 error:
 	if (state) kfree(state);
 	return NULL;
-	}
+}
 
 static struct dvb_frontend_ops nxt6000_ops = {
 

drivers/media/dvb/frontends/sp887x.c

@@ -20,13 +20,9 @@
 
 
 struct sp887x_state {
-
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	const struct sp887x_config* config;
-
 	struct dvb_frontend frontend;
 
 	/* demodulator private data */
@@ -345,19 +341,6 @@ static void sp887x_correct_offsets (struct sp887x_state* state,
 	sp887x_writereg(state, 0x30a, frequency_shift & 0xfff);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,
 					     struct dvb_frontend_parameters *p)
 {
@@ -421,7 +404,7 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,
 }
 
 static int sp887x_read_status(struct dvb_frontend* fe, fe_status_t* status)
-	{
+{
 	struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
 	u16 snr12 = sp887x_readreg(state, 0xf16);
 	u16 sync0x200 = sp887x_readreg(state, 0x200);
@@ -452,10 +435,10 @@ static int sp887x_read_status(struct dvb_frontend* fe, fe_status_t* status)
 	}
 
 	return 0;
-	}
+}
 
 static int sp887x_read_ber(struct dvb_frontend* fe, u32* ber)
-	{
+{
 	struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
 
 	*ber = (sp887x_readreg(state, 0xc08) & 0x3f) |
@@ -466,10 +449,10 @@ static int sp887x_read_ber(struct dvb_frontend* fe, u32* ber)
 		*ber = ~0;
 
 	return 0;
-	}
+}
 
 static int sp887x_read_signal_strength(struct dvb_frontend* fe, u16* strength)
-	{
+{
 	struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
 
 	u16 snr12 = sp887x_readreg(state, 0xf16);
@@ -477,17 +460,17 @@ static int sp887x_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 	*strength = (signal < 0xffff) ? signal : 0xffff;
 
 	return 0;
-	}
+}
 
 static int sp887x_read_snr(struct dvb_frontend* fe, u16* snr)
-	{
+{
 	struct sp887x_state* state = (struct sp887x_state*) fe->demodulator_priv;
 
 	u16 snr12 = sp887x_readreg(state, 0xf16);
 	*snr = (snr12 << 4) | (snr12 >> 8);
 
 	return 0;
-	}
+}
 
 static int sp887x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
@@ -508,7 +491,7 @@ static int sp887x_sleep(struct dvb_frontend* fe)
 	sp887x_writereg(state, 0xc18, 0x000);
 
 	return 0;
-	}
+}
 
 static int sp887x_init(struct dvb_frontend* fe)
 {

drivers/media/dvb/frontends/stv0299.c

@@ -54,13 +54,9 @@
 #include "stv0299.h"
 
 struct stv0299_state {
-
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	const struct stv0299_config* config;
-
 	struct dvb_frontend frontend;
 
 	u8 initialised:1;
@@ -102,7 +98,6 @@ int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data)
 	return stv0299_writeregI(state, reg, data);
 }
 
-
 static u8 stv0299_readreg (struct stv0299_state* state, u8 reg)
 {
 	int ret;
@@ -120,7 +115,6 @@ static u8 stv0299_readreg (struct stv0299_state* state, u8 reg)
 	return b1[0];
 }
 
-
 static int stv0299_readregs (struct stv0299_state* state, u8 reg1, u8 *b, u8 len)
 {
 	int ret;
@@ -135,7 +129,6 @@ static int stv0299_readregs (struct stv0299_state* state, u8 reg1, u8 *b, u8 len
 	return ret == 2 ? 0 : ret;
 }
 
-
 static int stv0299_set_FEC (struct stv0299_state* state, fe_code_rate_t fec)
 {
 	dprintk ("%s\n", __FUNCTION__);
@@ -169,10 +162,9 @@ static int stv0299_set_FEC (struct stv0299_state* state, fe_code_rate_t fec)
 	{
 		return -EINVAL;
 	}
-}
+    }
 }
 
-
 static fe_code_rate_t stv0299_get_fec (struct stv0299_state* state)
 {
 	static fe_code_rate_t fec_tab [] = { FEC_2_3, FEC_3_4, FEC_5_6,
@@ -190,7 +182,6 @@ static fe_code_rate_t stv0299_get_fec (struct stv0299_state* state)
 	return fec_tab [index];
 }
 
-
 static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)
 {
 	unsigned long start = jiffies;
@@ -208,7 +199,6 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)
 	return 0;
 }
 
-
 static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
 {
 	unsigned long start = jiffies;
@@ -244,7 +234,6 @@ static int stv0299_set_symbolrate (struct dvb_frontend* fe, u32 srate)
 	return state->config->set_symbol_rate(fe, srate, ratio);
 }
 
-
 static int stv0299_get_symbolrate (struct stv0299_state* state)
 {
 	u32 Mclk = state->config->mclk / 4096L;
@@ -277,19 +266,6 @@ static int stv0299_get_symbolrate (struct stv0299_state* state)
 	return srate;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
 				    struct dvb_diseqc_master_cmd *m)
 {
@@ -321,7 +297,6 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe,
 	return 0;
 }
 
-
 static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
@@ -349,7 +324,6 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t
 	return 0;
 }
 
-
 static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
@@ -372,7 +346,6 @@ static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 	}
 }
 
-
 static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
@@ -412,7 +385,6 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
 	};
 }
 
-
 static int stv0299_send_legacy_dish_cmd(struct dvb_frontend* fe, u32 cmd)
 {
 	u8 last = 1;
@@ -433,9 +405,7 @@ static int stv0299_send_legacy_dish_cmd(struct dvb_frontend* fe, u32 cmd)
 
 	for (i=0; i<9; i++) {
 		if((cmd & 0x01) != last) {
-			stv0299_set_voltage(fe,
-					    last ? SEC_VOLTAGE_13 :
-					    	   SEC_VOLTAGE_18);
+			stv0299_set_voltage(fe, last ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);
 			last = (last) ? 0 : 1;
 		}
 
@@ -448,7 +418,6 @@ static int stv0299_send_legacy_dish_cmd(struct dvb_frontend* fe, u32 cmd)
 	return 0;
 }
 
-
 static int stv0299_init (struct dvb_frontend* fe)
 {
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
@@ -468,9 +437,8 @@ static int stv0299_init (struct dvb_frontend* fe)
 	return 0;
 }
 
-
 static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
-	{
+{
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
 
 	u8 signal = 0xff - stv0299_readreg (state, 0x18);
@@ -495,7 +463,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		*status |= FE_HAS_LOCK;
 
 	return 0;
-	}
+}
 
 static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 {
@@ -505,10 +473,10 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 	*ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
 
 	return 0;
-		}
+}
 
 static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
-	{
+{
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
 
 	s32 signal =  0xffff - ((stv0299_readreg (state, 0x18) << 8)
@@ -522,10 +490,10 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 	*strength = (signal > 0xffff) ? 0xffff : (signal < 0) ? 0 : signal;
 
 	return 0;
-		}
+}
 
 static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr)
-        {
+{
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
 
 	s32 xsnr = 0xffff - ((stv0299_readreg (state, 0x24) << 8)
@@ -612,10 +580,10 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 	state->symbol_rate = p->u.qpsk.symbol_rate;
 
 	return 0;
-        }
+}
 
 static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p)
-        {
+{
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
 	s32 derot_freq;
 	int invval;
@@ -637,7 +605,7 @@ static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 	p->u.qpsk.symbol_rate = stv0299_get_symbolrate (state);
 
 	return 0;
-		}
+}
 
 static int stv0299_sleep(struct dvb_frontend* fe)
 {
@@ -650,7 +618,7 @@ static int stv0299_sleep(struct dvb_frontend* fe)
 }
 
 static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
-	{
+{
         struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
 
 	fesettings->min_delay_ms = state->config->min_delay_ms;
@@ -665,7 +633,7 @@ static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_fronten
 }
 
 static void stv0299_release(struct dvb_frontend* fe)
-		{
+{
 	struct stv0299_state* state = (struct stv0299_state*) fe->demodulator_priv;
 	kfree(state);
 }

drivers/media/dvb/frontends/tda10021.c

@@ -35,14 +35,10 @@
 
 
 struct tda10021_state {
-
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	/* configuration settings */
 	const struct tda10021_config* config;
-
 	struct dvb_frontend frontend;
 
 	u8 pwm;
@@ -94,7 +90,6 @@ static int tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data)
 	return (ret != 1) ? -EREMOTEIO : 0;
 }
 
-
 static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
 {
 	u8 b0 [] = { reg };
@@ -208,15 +203,6 @@ static int tda10021_set_symbolrate (struct tda10021_state* state, u32 symbolrate
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
 static int tda10021_init (struct dvb_frontend *fe)
 {
 	struct tda10021_state* state = (struct tda10021_state*) fe->demodulator_priv;

drivers/media/dvb/frontends/tda10021.h

@@ -37,7 +37,6 @@ struct tda10021_config
 };
 
 extern struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,
-					    struct i2c_adapter* i2c,
-					    u8 pwm);
+					    struct i2c_adapter* i2c, u8 pwm);
 
 #endif // TDA10021_H

drivers/media/dvb/frontends/tda1004x.c

@@ -39,19 +39,14 @@
 #define TDA1004X_DEMOD_TDA10046 1
 
 
-struct tda1004x_state
-{
+struct tda1004x_state {
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	const struct tda1004x_config* config;
-
 	struct dvb_frontend frontend;
 
 	/* private demod data */
 	u8 initialised:1;
-
 	u8 demod_type;
 };
 
@@ -347,7 +342,6 @@ static int tda1004x_check_upload_ok(struct tda1004x_state *state, u8 dspVersion)
 	return 0;
 }
 
-
 static int tda10045_fwupload(struct dvb_frontend* fe)
 {
 	struct tda1004x_state* state = fe->demodulator_priv;
@@ -474,29 +468,12 @@ static int tda1004x_decode_fec(int tdafec)
 	return -1;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 int tda1004x_write_byte(struct dvb_frontend* fe, int reg, int data)
 {
 	struct tda1004x_state* state = fe->demodulator_priv;
 
 	return tda1004x_write_byteI(state, reg, data);
-		}
+}
 
 static int tda10045_init(struct dvb_frontend* fe)
 {
@@ -537,7 +514,7 @@ static int tda10045_init(struct dvb_frontend* fe)
 
 	state->initialised = 1;
 	return 0;
-		}
+}
 
 static int tda10046_init(struct dvb_frontend* fe)
 {
@@ -1075,21 +1052,21 @@ static int tda1004x_sleep(struct dvb_frontend* fe)
 	state->initialised = 0;
 
 	return 0;
-		}
+}
 
 static int tda1004x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
-	{
+{
 	fesettings->min_delay_ms = 800;
 	fesettings->step_size = 166667;
 	fesettings->max_drift = 166667*2;
 	return 0;
-	}
+}
 
 static void tda1004x_release(struct dvb_frontend* fe)
 {
 	struct tda1004x_state* state = (struct tda1004x_state*) fe->demodulator_priv;
 	kfree(state);
-	}
+}
 
 static struct dvb_frontend_ops tda10045_ops;
 
@@ -1120,7 +1097,7 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
 error:
 	if (state) kfree(state);
 	return NULL;
-	}
+}
 
 static struct dvb_frontend_ops tda10046_ops;
 
@@ -1151,7 +1128,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
 error:
 	if (state) kfree(state);
 	return NULL;
-		}
+}
 
 static struct dvb_frontend_ops tda10045_ops = {
 

drivers/media/dvb/frontends/tda8083.c

@@ -35,14 +35,10 @@
 
 
 struct tda8083_state {
-
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	/* configuration settings */
 	const struct tda8083_config* config;
-
 	struct dvb_frontend frontend;
 };
 
@@ -78,7 +74,6 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data)
         return (ret != 1) ? -1 : 0;
 }
 
-
 static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len)
 {
 	int ret;
@@ -94,7 +89,6 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len
         return ret == 2 ? 0 : -1;
 }
 
-
 static inline u8 tda8083_readreg (struct tda8083_state* state, u8 reg)
 {
 	u8 val;
@@ -104,8 +98,6 @@ static inline u8 tda8083_readreg (struct tda8083_state* state, u8 reg)
 	return val;
 }
 
-
-
 static int tda8083_set_inversion (struct tda8083_state* state, fe_spectral_inversion_t inversion)
 {
 	/*  XXX FIXME: implement other modes than FEC_AUTO */
@@ -115,7 +107,6 @@ static int tda8083_set_inversion (struct tda8083_state* state, fe_spectral_inver
 	return -EINVAL;
 }
 
-
 static int tda8083_set_fec (struct tda8083_state* state, fe_code_rate_t fec)
 {
 	if (fec == FEC_AUTO)
@@ -127,7 +118,6 @@ static int tda8083_set_fec (struct tda8083_state* state, fe_code_rate_t fec)
 	return -EINVAL;
 }
 
-
 static fe_code_rate_t tda8083_get_fec (struct tda8083_state* state)
 {
 	u8 index;
@@ -139,7 +129,6 @@ static fe_code_rate_t tda8083_get_fec (struct tda8083_state* state)
 	return fec_tab [index];
 }
 
-
 static int tda8083_set_symbolrate (struct tda8083_state* state, u32 srate)
 {
         u32 ratio;
@@ -179,7 +168,6 @@ static int tda8083_set_symbolrate (struct tda8083_state* state, u32 srate)
 	return 1;
 }
 
-
 static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout)
 {
 	unsigned long start = jiffies;
@@ -205,7 +193,6 @@ static int tda8083_set_tone (struct tda8083_state* state, fe_sec_tone_mode_t ton
 	};
 }
 
-
 static int tda8083_set_voltage (struct tda8083_state* state, fe_sec_voltage_t voltage)
 {
 	switch (voltage) {
@@ -236,27 +223,6 @@ static int tda8083_send_diseqc_burst (struct tda8083_state* state, fe_sec_mini_c
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 static int tda8083_send_diseqc_msg (struct dvb_frontend* fe,
 				    struct dvb_diseqc_master_cmd *m)
 {

drivers/media/dvb/frontends/tda80xx.c

@@ -445,21 +445,6 @@ static int tda8083_init(struct dvb_frontend* fe)
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 static int tda80xx_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
 	struct tda80xx_state* state = (struct tda80xx_state*) fe->demodulator_priv;

drivers/media/dvb/frontends/ves1820.c

@@ -34,14 +34,10 @@
 
 
 struct ves1820_state {
-
-	struct i2c_adapter *i2c;
-
+	struct i2c_adapter* i2c;
 	struct dvb_frontend_ops ops;
-
 	/* configuration settings */
 	const struct ves1820_config* config;
-
 	struct dvb_frontend frontend;
 
 	/* private demodulator data */
@@ -80,8 +76,8 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
 
 static u8 ves1820_readreg(struct ves1820_state *state, u8 reg)
 {
-	u8 b0 [] = { 0x00, reg };
-	u8 b1 [] = { 0 };
+	u8 b0[] = { 0x00, reg };
+	u8 b1[] = { 0 };
 	struct i2c_msg msg[] = {
 		{.addr = state->config->demod_address,.flags = 0,.buf = b0,.len = 2},
 		{.addr = state->config->demod_address,.flags = I2C_M_RD,.buf = b1,.len = 1}
@@ -97,7 +93,6 @@ static u8 ves1820_readreg(struct ves1820_state *state, u8 reg)
 	return b1[0];
 }
 
-
 static int ves1820_setup_reg0(struct ves1820_state *state, u8 reg0, fe_spectral_inversion_t inversion)
 {
 	reg0 |= state->reg0 & 0x62;
@@ -105,9 +100,7 @@ static int ves1820_setup_reg0(struct ves1820_state *state, u8 reg0, fe_spectral_
 	if (INVERSION_ON == inversion) {
 		if (!state->config->invert) reg0 |= 0x20;
 		else reg0 &= ~0x20;
-	
 	} else if (INVERSION_OFF == inversion) {
-
 		if (!state->config->invert) reg0 &= ~0x20;
 		else reg0 |= 0x20;
 	}
@@ -124,7 +117,7 @@ static int ves1820_set_symbolrate(struct ves1820_state *state, u32 symbolrate)
 {
 	s32 BDR;
 	s32 BDRI;
-        s16 SFIL=0;
+	s16 SFIL = 0;
 	u16 NDEC = 0;
 	u32 ratio;
 	u32 fin;
@@ -198,18 +191,6 @@ static int ves1820_set_symbolrate(struct ves1820_state *state, u32 symbolrate)
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 static int ves1820_init(struct dvb_frontend* fe)
 {
 	struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
@@ -234,11 +215,11 @@ static int ves1820_init(struct dvb_frontend* fe)
 static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
 	struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
-	static const u8 reg0x00 [] = { 0x00, 0x04, 0x08, 0x0c, 0x10 };
-	static const u8 reg0x01 [] = {  140,  140,  106,  100,   92 };
-	static const u8 reg0x05 [] = {  135,  100,   70,   54,   38 };
-	static const u8 reg0x08 [] = {  162,  116,   67,   52,   35 };
-	static const u8 reg0x09 [] = {  145,  150,  106,  126,  107 };
+	static const u8 reg0x00[] = { 0x00, 0x04, 0x08, 0x0c, 0x10 };
+	static const u8 reg0x01[] = { 140, 140, 106, 100, 92 };
+	static const u8 reg0x05[] = { 135, 100, 70, 54, 38 };
+	static const u8 reg0x08[] = { 162, 116, 67, 52, 35 };
+	static const u8 reg0x09[] = { 145, 150, 106, 126, 107 };
 	int real_qam = p->u.qam.modulation - QAM_16;
 
 	if (real_qam < 0 || real_qam > 4)
@@ -264,7 +245,6 @@ static int ves1820_read_status(struct dvb_frontend* fe, fe_status_t* status)
 	int sync;
 
 	*status = 0;
-
 	sync = ves1820_readreg(state, 0x11);
 
 	if (sync & 1)
@@ -283,10 +263,10 @@ static int ves1820_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		*status |= FE_HAS_LOCK;
 
 	return 0;
-	}
+}
 
 static int ves1820_read_ber(struct dvb_frontend* fe, u32* ber)
-	{
+{
 	struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
 
 	u32 _ber = ves1820_readreg(state, 0x14) |
@@ -295,27 +275,27 @@ static int ves1820_read_ber(struct dvb_frontend* fe, u32* ber)
 	*ber = 10 * _ber;
 
 	return 0;
-	}
+}
 
 static int ves1820_read_signal_strength(struct dvb_frontend* fe, u16* strength)
-	{
+{
 	struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
 
 	u8 gain = ves1820_readreg(state, 0x17);
 	*strength = (gain << 8) | gain;
 
 	return 0;
-	}
+}
 
 static int ves1820_read_snr(struct dvb_frontend* fe, u16* snr)
-	{
+{
 	struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
 
 	u8 quality = ~ves1820_readreg(state, 0x18);
 	*snr = (quality << 8) | quality;
 
 	return 0;
-	}
+}
 
 static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
@@ -333,7 +313,7 @@ static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 }
 
 static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
-	{
+{
 	struct ves1820_state* state = (struct ves1820_state*) fe->demodulator_priv;
 	int sync;
 	s8 afc = 0;
@@ -358,7 +338,7 @@ static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
 	p->frequency = ((p->frequency + 31250) / 62500) * 62500;
 	if (sync & 2)
-			p->frequency -= ((s32)p->u.qam.symbol_rate * afc) >> 10;
+		p->frequency -= ((s32) p->u.qam.symbol_rate * afc) >> 10;
 
 	return 0;
 }
@@ -426,7 +406,7 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
 error:
 	if (state) kfree(state);
 	return NULL;
-	}
+}
 
 static struct dvb_frontend_ops ves1820_ops = {
 

drivers/media/dvb/frontends/ves1820.h

@@ -46,7 +46,6 @@ struct ves1820_config
 };
 
 extern struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,
-					   struct i2c_adapter* i2c,
-					   u8 pwm);
+					   struct i2c_adapter* i2c, u8 pwm);
 
 #endif // VES1820_H

drivers/media/dvb/frontends/ves1x93.c

@@ -35,14 +35,10 @@
 
 
 struct ves1x93_state {
-
 	struct i2c_adapter* i2c;
-
 	struct dvb_frontend_ops ops;
-
 	/* configuration settings */
 	const struct ves1x93_config* config;
-
 	struct dvb_frontend frontend;
 
 	/* previous uncorrected block counter */
@@ -69,7 +65,6 @@ static u8 init_1893_tab [] = {
 	0x00, 0x55, 0x00, 0x00, 0x7f, 0x00
 };
 
-
 static u8 init_1993_tab [] = {
 	0x00, 0x9c, 0x35, 0x80, 0x6a, 0x09, 0x72, 0x8c,
 	0x09, 0x6b, 0x00, 0x00, 0x4c, 0x08, 0x00, 0x00,
@@ -89,7 +84,6 @@ static u8 init_1893_wtab[] =
 	1,1,1,0,1,1
 };
 
-
 static u8 init_1993_wtab[] =
 {
 	1,1,1,1,1,1,1,1, 1,1,0,0,1,1,0,0,
@@ -112,7 +106,6 @@ static int ves1x93_writereg (struct ves1x93_state* state, u8 reg, u8 data)
 	return 0;
 }
 
-
 static u8 ves1x93_readreg (struct ves1x93_state* state, u8 reg)
 {
 	int ret;
@@ -163,7 +156,6 @@ static int ves1x93_set_inversion (struct ves1x93_state* state, fe_spectral_inver
 	return ves1x93_writereg (state, 0x0c, (state->init_1x93_tab[0x0c] & 0x3f) | val);
 }
 
-
 static int ves1x93_set_fec (struct ves1x93_state* state, fe_code_rate_t fec)
 {
 	if (fec == FEC_AUTO)
@@ -174,13 +166,11 @@ static int ves1x93_set_fec (struct ves1x93_state* state, fe_code_rate_t fec)
 		return ves1x93_writereg (state, 0x0d, fec - FEC_1_2);
 }
 
-
 static fe_code_rate_t ves1x93_get_fec (struct ves1x93_state* state)
 {
 	return FEC_1_2 + ((ves1x93_readreg (state, 0x0d) >> 4) & 0x7);
 }
 
-
 static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
 {
 	u32 BDR;
@@ -265,20 +255,6 @@ static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 static int ves1x93_init (struct dvb_frontend* fe)
 {
 	struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
@@ -360,11 +336,10 @@ static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status)
 		*status |= FE_HAS_LOCK;
 
 	return 0;
-	}
-
+}
 
 static int ves1x93_read_ber(struct dvb_frontend* fe, u32* ber)
-	{
+{
 	struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
 
 	*ber = ves1x93_readreg (state, 0x15);
@@ -373,30 +348,30 @@ static int ves1x93_read_ber(struct dvb_frontend* fe, u32* ber)
 	*ber *= 10;
 
 	return 0;
-	}
+}
 
 static int ves1x93_read_signal_strength(struct dvb_frontend* fe, u16* strength)
-	{
+{
 	struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
 
 	u8 signal = ~ves1x93_readreg (state, 0x0b);
 	*strength = (signal << 8) | signal;
 
 	return 0;
-	}
+}
 
 static int ves1x93_read_snr(struct dvb_frontend* fe, u16* snr)
-	{
+{
 	struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
 
 	u8 _snr = ~ves1x93_readreg (state, 0x1c);
 	*snr = (_snr << 8) | _snr;
 
 	return 0;
-	}
+}
 
 static int ves1x93_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
-	{
+{
 	struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
 
 	*ucblocks = ves1x93_readreg (state, 0x18) & 0x7f;
@@ -408,10 +383,10 @@ static int ves1x93_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 	ves1x93_writereg (state, 0x18, 0x80);  /* dto. */
 
 	return 0;
-	}
+}
 
 static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
-        {
+{
 	struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
 
 	ves1x93_writereg(state, 0x00, 0x11);
@@ -423,10 +398,10 @@ static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 	state->inversion = p->inversion;
 
 	return 0;
-        }
+}
 
 static int ves1x93_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
-	{
+{
 	struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
 	int afc;
 
@@ -518,7 +493,7 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
 error:
 	if (state) kfree(state);
 	return NULL;
-	}
+}
 
 static struct dvb_frontend_ops ves1x93_ops = {
 

drivers/media/dvb/ttpci/av7110.h

@@ -283,4 +283,3 @@ extern int av7110_init_v4l(struct av7110 *av7110);
 extern int av7110_exit_v4l(struct av7110 *av7110);
 
 #endif /* _AV7110_H_ */
-

drivers/media/dvb/ttpci/av7110_hw.c

@@ -962,7 +962,7 @@ static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u
 }
 
 static int OSDSetBlock(struct av7110 *av7110, int x0, int y0,
-		       int x1, int y1, int inc, u8 __user *data)
+		       int x1, int y1, int inc, u8 __user * data)
 {
 	uint w, h, bpp, bpl, size, lpb, bnum, brest;
 	int i;

drivers/media/dvb/ttpci/av7110_ipack.h

@@ -10,4 +10,3 @@ extern void av7110_ipack_free(struct ipack * p);
 extern void av7110_ipack_flush(struct ipack *p);
 
 #endif
-

drivers/media/dvb/ttpci/av7110_v4l.c

@@ -70,8 +70,6 @@ int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
 	return 0;
 }
 
-
-
 static struct v4l2_input inputs[2] = {
 	{
 		.index		= 0,

drivers/media/dvb/ttpci/budget.h

@@ -69,8 +69,6 @@ struct budget {
 	void *priv;
 };
 
-
-
 #define MAKE_BUDGET_INFO(x_var,x_name,x_type) \
 static struct budget_info x_var ## _info = { \
 	.name=x_name,	\
@@ -101,9 +99,9 @@ static struct saa7146_pci_extension_data x_var = { \
 extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
 			     struct saa7146_pci_extension_data *info,
 			     struct module *owner);
-extern int ttpci_budget_deinit (struct budget *budget);
-extern void ttpci_budget_irq10_handler (struct saa7146_dev* dev, u32 *isr);
-extern void ttpci_budget_set_video_port(struct saa7146_dev* dev, int video_port);
+extern int ttpci_budget_deinit(struct budget *budget);
+extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);
+extern void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port);
 extern int ttpci_budget_debiread(struct budget *budget, u32 config, int addr, int count,
 				 int uselocks, int nobusyloop);
 extern int ttpci_budget_debiwrite(struct budget *budget, u32 config, int addr, int count, u32 value,

drivers/media/dvb/ttpci/ttpci-eeprom.c

@@ -90,7 +90,7 @@ static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encode
 	u8 b0[] = { 0xcc };
 
 	struct i2c_msg msg[] = {
-		{.addr = 0x50,.flags = 0,.buf = b0,.len = 1},
+		{ .addr = 0x50, .flags = 0, .buf = b0, .len = 1 },
 		{ .addr = 0x50, .flags = I2C_M_RD, .buf = encodedMAC, .len = 20 }
 	};
 
@@ -144,4 +144,3 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ralph Metzler, Marcus Metzler, others");
 MODULE_DESCRIPTION("Decode dvb_net MAC address from EEPROM of PCI DVB cards "
 		"made by Siemens, Technotrend, Hauppauge");
-

drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c

@@ -33,6 +33,7 @@
 #include <linux/dvb/dmx.h>
 #include <linux/pci.h>
 
+
 /*
   TTUSB_HWSECTIONS:
     the DSP supports filtering in hardware, however, since the "muxstream"
@@ -118,7 +119,6 @@ struct ttusb {
 	int cc;			/* MuxCounter - will increment on EVERY MUX PACKET */
 	/* (including stuffing. yes. really.) */
 
-
 	u8 last_result[32];
 
 	struct ttusb_channel {

drivers/media/dvb/ttusb-dec/ttusb_dec.c

@@ -513,7 +513,7 @@ static void swap_bytes(u8 *b, int length)
 	}
 }
 
-static void ttusb_dec_process_urb_frame(struct ttusb_dec * dec, u8 * b,
+static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b,
 					int length)
 {
 	swap_bytes(b, length);
@@ -676,7 +676,6 @@ static void ttusb_dec_process_urb(struct urb *urb, struct pt_regs *ptregs)
 
 		for (i = 0; i < FRAMES_PER_ISO_BUF; i++) {
 			struct usb_iso_packet_descriptor *d;
-
 			u8 *b;
 			int length;
 			struct urb_frame *frame;
@@ -1587,4 +1586,3 @@ MODULE_AUTHOR("Alex Woods <linux-dvb@giblets.org>");
 MODULE_DESCRIPTION(DRIVER_NAME);
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(usb, ttusb_dec_table);
-

include/linux/dvb/version.h

@@ -27,4 +27,3 @@
 #define DVB_API_VERSION_MINOR 1
 
 #endif /*_DVBVERSION_H_*/
-