- remove stupid DEB_* debugging macro horror from av7110 and budget drivers, replace them

with dprintk(level, msg) instead
- remove whitespace and linefeed violations all over the place

1 files changed, 26 insertions, 36 deletions

diff --git a/linux/drivers/media/dvb/ttpci/av7110_av.c b/linux/drivers/media/dvb/ttpci/av7110_av.c
index 52633adee..153c1b041 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_av.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_av.c
@@ -97,8 +97,6 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
 {
 	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) p2t->priv;
 
-//	DEB_EE(("struct dvb_filter_pes2ts:%p\n", p2t));
-
 	if (!(dvbdmxfeed->ts_type & TS_PACKET))
 		return 0;
 	if (buf[3] == 0xe0)	 // video PES do not have a length in TS
@@ -114,8 +112,6 @@ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
 {
 	struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) priv;
 
-//	DEB_EE(("dvb_demux_feed:%p\n", dvbdmxfeed));
-
 	dvbdmxfeed->cb.ts(data, 188, NULL, 0,
 			  &dvbdmxfeed->feed.ts, DMX_OK);
 	return 0;
@@ -126,7 +122,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
 {
 	struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
 
-	DEB_EE(("av7110: %p, dvb_demux_feed:%p\n", av7110, dvbdmxfeed));
+	dprintk(2, "av7110:%p, , dvb_demux_feed:%p\n", av7110, dvbdmxfeed);
 
 	if (av7110->playing || (av7110->rec_mode & av))
 		return -EBUSY;
@@ -168,7 +164,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
 
 int av7110_av_start_play(struct av7110 *av7110, int av)
 {
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (av7110->rec_mode)
 		return -EBUSY;
@@ -201,7 +197,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av)
 
 void av7110_av_stop(struct av7110 *av7110, int av)
 {
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (!(av7110->playing & av) && !(av7110->rec_mode & av))
 		return;
@@ -242,8 +238,6 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
 	u32 sync;
 	u16 blen;
 
-	DEB_EE(("dvb_ring_buffer_t: %p\n", buf));
-
 	if (!dlen) {
 		wake_up(&buf->queue);
 		return -1;
@@ -274,8 +268,8 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
 
 	dvb_ringbuffer_read(buf, dest, (size_t) blen, 0);
 
-	DEB_S(("pread=0x%08lx, pwrite=0x%08lx\n",
-	       (unsigned long) buf->pread, (unsigned long) buf->pwrite));
+	dprintk(2, "pread=0x%08lx, pwrite=0x%08lx\n",
+	       (unsigned long) buf->pread, (unsigned long) buf->pwrite);
 	wake_up(&buf->queue);
 	return blen;
 }
@@ -284,7 +278,7 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright)
 {
 	int err, vol, val, balance = 0;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	av7110->mixer.volume_left = volleft;
 	av7110->mixer.volume_right = volright;
@@ -323,7 +317,7 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright)
 
 void av7110_set_vidmode(struct av7110 *av7110, int mode)
 {
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode);
 
@@ -351,7 +345,7 @@ static void get_video_format(struct av7110 *av7110, u8 *buf, int count)
 	int sw;
 	u8 *p;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (av7110->sinfo)
 		return;
@@ -364,7 +358,7 @@ static void get_video_format(struct av7110 *av7110, u8 *buf, int count)
 		vsize = ((p[1] &0x0F) << 8) | (p[2]);
 		sw = (p[3] & 0x0F);
 		av7110_set_vidmode(av7110, sw2mode[sw]);
-		DEB_S(("dvb: playback %dx%d fr=%d\n", hsize, vsize, sw));
+		dprintk(2, "playback %dx%d fr=%d\n", hsize, vsize, sw);
 		av7110->sinfo = 1;
 		break;
 	}
@@ -401,7 +395,7 @@ static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf,
 static void play_video_cb(u8 *buf, int count, void *priv)
 {
 	struct av7110 *av7110 = (struct av7110 *) priv;
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if ((buf[3] & 0xe0) == 0xe0) {
 		get_video_format(av7110, buf, count);
@@ -413,7 +407,7 @@ static void play_video_cb(u8 *buf, int count, void *priv)
 static void play_audio_cb(u8 *buf, int count, void *priv)
 {
 	struct av7110 *av7110 = (struct av7110 *) priv;
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	aux_ring_buffer_write(&av7110->aout, buf, count);
 }
@@ -425,7 +419,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const u8 __user *buf,
 			unsigned long count, int nonblock, int type)
 {
 	unsigned long todo = count, n;
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -458,7 +452,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf,
 			unsigned long count, int nonblock, int type)
 {
 	unsigned long todo = count, n;
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -488,7 +482,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const u8 __user *buf,
 			 unsigned long count, int nonblock, int type)
 {
 	unsigned long todo = count, n;
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -767,7 +761,7 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l
 	struct av7110 *av7110 = (struct av7110 *) demux->priv;
 	struct ipack *ipack = &av7110->ipack[feed->pes_type];
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	switch (feed->pes_type) {
 	case 0:
@@ -808,8 +802,6 @@ void dvb_video_add_event(struct av7110 *av7110, struct video_event *event)
 	struct dvb_video_events *events = &av7110->video_events;
 	int wp;
 
-	DEB_D(("\n"));
-
 	spin_lock_bh(&events->lock);
 
 	wp = (events->eventw + 1) % MAX_VIDEO_EVENT;
@@ -832,8 +824,6 @@ static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event
 {
 	struct dvb_video_events *events = &av7110->video_events;
 
-	DEB_D(("\n"));
-
 	if (events->overflow) {
 		events->overflow = 0;
 		return -EOVERFLOW;
@@ -872,7 +862,7 @@ static unsigned int dvb_video_poll(struct file *file, poll_table *wait)
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	unsigned int mask = 0;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if ((file->f_flags & O_ACCMODE) != O_RDONLY)
 		poll_wait(file, &av7110->avout.queue, wait);
@@ -899,7 +889,7 @@ static ssize_t dvb_video_write(struct file *file, const char __user *buf,
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if ((file->f_flags & O_ACCMODE) == O_RDONLY)
 		return -EPERM;
@@ -916,7 +906,7 @@ static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	unsigned int mask = 0;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	poll_wait(file, &av7110->aout.queue, wait);
 
@@ -935,7 +925,7 @@ static ssize_t dvb_audio_write(struct file *file, const char __user *buf,
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (av7110->audiostate.stream_source != AUDIO_SOURCE_MEMORY) {
 		printk(KERN_ERR "not audio source memory\n");
@@ -952,7 +942,7 @@ static int play_iframe(struct av7110 *av7110, u8 __user *buf, unsigned int len,
 {
 	int i, n;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (!(av7110->playing & RP_VIDEO)) {
 		if (av7110_av_start_play(av7110, RP_VIDEO) < 0)
@@ -982,7 +972,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
 	unsigned long arg = (unsigned long) parg;
 	int ret = 0;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
 		if ( cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT &&
@@ -1178,7 +1168,7 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
 	unsigned long arg = (unsigned long) parg;
 	int ret = 0;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (((file->f_flags & O_ACCMODE) == O_RDONLY) &&
 	    (cmd != AUDIO_GET_STATUS))
@@ -1294,7 +1284,7 @@ static int dvb_video_open(struct inode *inode, struct file *file)
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	int err;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if ((err = dvb_generic_open(inode, file)) < 0)
 		return err;
@@ -1318,7 +1308,7 @@ static int dvb_video_release(struct inode *inode, struct file *file)
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
 		av7110_av_stop(av7110, RP_VIDEO);
@@ -1333,7 +1323,7 @@ static int dvb_audio_open(struct inode *inode, struct file *file)
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	int err=dvb_generic_open(inode, file);
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	if (err < 0)
 		return err;
@@ -1347,7 +1337,7 @@ static int dvb_audio_release(struct inode *inode, struct file *file)
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	DEB_EE(("av7110: %p\n", av7110));
+	dprintk(2, "av7110:%p, \n", av7110);
 
 	av7110_av_stop(av7110, RP_AUDIO);
 	return dvb_generic_release(inode, file);