Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d0b80e authored by Joe Perches's avatar Joe Perches Committed by Mauro Carvalho Chehab
Browse files

[media] saa7146: Use current logging styles 



Standardize the mechanisms to emit logging messages.

A few other modules used an #include from saa7146,
convert those at the same time.

Add pr_fmt.
Convert printks to pr_<level>
Convert printks without KERN_<level> to appropriate pr_<level>.
Convert logging macros requiring multiple parentheses to normal style.
Removed embedded prefixes when pr_fmt was added.
Whitespace cleanups when around other conversions.
Use printf extension %pM to print mac address.
Coalesce format strings.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarMichael Hunold <michael@mihu.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0b8bd83c

drivers/media/common/saa7146_core.c

+39 −35
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <media/saa7146.h>



LIST_HEAD(saa7146_devices);
@@ -35,10 +37,9 @@ static void dump_registers(struct saa7146_dev* dev) 
{

	int i = 0;



	INFO((" @ %li jiffies:\n",jiffies));

	for(i = 0; i <= 0x148; i+=4) {

		printk("0x%03x: 0x%08x\n",i,saa7146_read(dev,i));

	}

	pr_info(" @ %li jiffies:\n", jiffies);

	for (i = 0; i <= 0x148; i += 4)

		pr_info("0x%03x: 0x%08x\n", i, saa7146_read(dev, i));

}

#endif
@@ -72,8 +73,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev, 
		if (saa7146_read(dev, MC2) & 2)

			break;

		if (err) {

			printk(KERN_ERR "%s: %s timed out while waiting for "

					"registers getting programmed\n",

			pr_err("%s: %s timed out while waiting for registers getting programmed\n",

			       dev->name, __func__);

			return -ETIMEDOUT;

		}
@@ -88,8 +88,8 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev, 
			break;

		saa7146_read(dev, MC2);

		if (err) {

			DEB_S(("%s: %s timed out while waiting for transfer "

				"completion\n",	dev->name, __func__));

			DEB_S("%s: %s timed out while waiting for transfer completion\n",

			      dev->name, __func__);

			return -ETIMEDOUT;

		}

		msleep(1);
@@ -109,8 +109,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev, 
		if (saa7146_read(dev, MC2) & 2)

			break;

		if (!loops--) {

			printk(KERN_ERR "%s: %s timed out while waiting for "

					"registers getting programmed\n",

			pr_err("%s: %s timed out while waiting for registers getting programmed\n",

			       dev->name, __func__);

			return -ETIMEDOUT;

		}
@@ -124,8 +123,8 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev, 
			break;

		saa7146_read(dev, MC2);

		if (!loops--) {

			DEB_S(("%s: %s timed out while waiting for transfer "

				"completion\n", dev->name, __func__));

			DEB_S("%s: %s timed out while waiting for transfer completion\n",

			      dev->name, __func__);

			return -ETIMEDOUT;

		}

		udelay(5);
@@ -264,7 +263,9 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt 
	ptr = pt->cpu;

	for (i = 0; i < sglen; i++, list++) {

/*

		printk("i:%d, adr:0x%08x, len:%d, offset:%d\n", i,sg_dma_address(list), sg_dma_len(list), list->offset);

		pr_debug("i:%d, adr:0x%08x, len:%d, offset:%d\n",

			 i, sg_dma_address(list), sg_dma_len(list),

			 list->offset);

*/

		for (p = 0; p * 4096 < list->length; p++, ptr++) {

			*ptr = cpu_to_le32(sg_dma_address(list) + p * 4096);
@@ -281,9 +282,9 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt 


/*

	ptr = pt->cpu;

	printk("offset: %d\n",pt->offset);

	pr_debug("offset: %d\n", pt->offset);

	for(i=0;i<5;i++) {

		printk("ptr1 %d: 0x%08x\n",i,ptr[i]);

		pr_debug("ptr1 %d: 0x%08x\n", i, ptr[i]);

	}

*/

	return 0;
@@ -314,7 +315,7 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id) 
		}

	}

	if (0 != (isr & (MASK_27))) {

		DEB_INT(("irq: RPS0 (0x%08x).\n",isr));

		DEB_INT("irq: RPS0 (0x%08x)\n", isr);

		if (dev->vv_data && dev->vv_callback)

			dev->vv_callback(dev,isr);

		isr &= ~MASK_27;
@@ -333,14 +334,15 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id) 
		} else {

			u32 psr = saa7146_read(dev, PSR);

			u32 ssr = saa7146_read(dev, SSR);

			printk(KERN_WARNING "%s: unexpected i2c irq: isr %08x psr %08x ssr %08x\n",

			pr_warn("%s: unexpected i2c irq: isr %08x psr %08x ssr %08x\n",

				dev->name, isr, psr, ssr);

		}

		isr &= ~(MASK_16|MASK_17);

	}

	if( 0 != isr ) {

		ERR(("warning: interrupt enabled, but not handled properly.(0x%08x)\n",isr));

		ERR(("disabling interrupt source(s)!\n"));

		ERR("warning: interrupt enabled, but not handled properly.(0x%08x)\n",

		    isr);

		ERR("disabling interrupt source(s)!\n");

		SAA7146_IER_DISABLE(dev,isr);

	}

	saa7146_write(dev, ISR, ack_isr);
@@ -360,15 +362,15 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	/* clear out mem for sure */

	dev = kzalloc(sizeof(struct saa7146_dev), GFP_KERNEL);

	if (!dev) {

		ERR(("out of memory.\n"));

		ERR("out of memory\n");

		goto out;

	}



	DEB_EE(("pci:%p\n",pci));

	DEB_EE("pci:%p\n", pci);



	err = pci_enable_device(pci);

	if (err < 0) {

		ERR(("pci_enable_device() failed.\n"));

		ERR("pci_enable_device() failed\n");

		goto err_free;

	}
@@ -389,7 +391,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	dev->mem = ioremap(pci_resource_start(pci, 0),

			   pci_resource_len(pci, 0));

	if (!dev->mem) {

		ERR(("ioremap() failed.\n"));

		ERR("ioremap() failed\n");

		err = -ENODEV;

		goto err_release;

	}
@@ -414,7 +416,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED,

			  dev->name, dev);

	if (err < 0) {

		ERR(("request_irq() failed.\n"));

		ERR("request_irq() failed\n");

		goto err_unmap;

	}
@@ -444,7 +446,9 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	/* create a nice device name */

	sprintf(dev->name, "saa7146 (%d)", saa7146_num);



	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));

	pr_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;



	mutex_init(&dev->v4l2_lock);
@@ -464,12 +468,12 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	err = -ENODEV;



	if (ext->probe && ext->probe(dev)) {

		DEB_D(("ext->probe() failed for %p. skipping device.\n",dev));

		DEB_D("ext->probe() failed for %p. skipping device.\n", dev);

		goto err_free_i2c;

	}



	if (ext->attach(dev, pci_ext)) {

		DEB_D(("ext->attach() failed for %p. skipping device.\n",dev));

		DEB_D("ext->attach() failed for %p. skipping device.\n", dev);

		goto err_free_i2c;

	}

	/* V4L extensions will set the pci drvdata to the v4l2_device in the
@@ -521,7 +525,7 @@ static void saa7146_remove_one(struct pci_dev *pdev) 
		{ NULL, 0 }

	}, *p;



	DEB_EE(("dev:%p\n",dev));

	DEB_EE("dev:%p\n", dev);



	dev->ext->detach(dev);

	/* Zero the PCI drvdata after use. */
@@ -552,21 +556,21 @@ static void saa7146_remove_one(struct pci_dev *pdev) 


int saa7146_register_extension(struct saa7146_extension* ext)

{

	DEB_EE(("ext:%p\n",ext));

	DEB_EE("ext:%p\n", ext);



	ext->driver.name = ext->name;

	ext->driver.id_table = ext->pci_tbl;

	ext->driver.probe = saa7146_init_one;

	ext->driver.remove = saa7146_remove_one;



	printk("saa7146: register extension '%s'.\n",ext->name);

	pr_info("register extension '%s'\n", ext->name);

	return pci_register_driver(&ext->driver);

}



int saa7146_unregister_extension(struct saa7146_extension* ext)

{

	DEB_EE(("ext:%p\n",ext));

	printk("saa7146: unregister extension '%s'.\n",ext->name);

	DEB_EE("ext:%p\n", ext);

	pr_info("unregister extension '%s'\n", ext->name);

	pci_unregister_driver(&ext->driver);

	return 0;

}

drivers/media/common/saa7146_fops.c

+64 −54
Original line number Diff line number Diff line 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <media/saa7146_vv.h>



/****************************************************************************/
@@ -9,21 +11,23 @@ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit) 
	struct saa7146_vv *vv = dev->vv_data;



	if (fh->resources & bit) {

		DEB_D(("already allocated! want: 0x%02x, cur:0x%02x\n",bit,vv->resources));

		DEB_D("already allocated! want: 0x%02x, cur:0x%02x\n",

		      bit, vv->resources);

		/* have it already allocated */

		return 1;

	}



	/* is it free? */

	if (vv->resources & bit) {

		DEB_D(("locked! vv->resources:0x%02x, we want:0x%02x\n",vv->resources,bit));

		DEB_D("locked! vv->resources:0x%02x, we want:0x%02x\n",

		      vv->resources, bit);

		/* no, someone else uses it */

		return 0;

	}

	/* it's free, grab it */

	fh->resources |= bit;

	vv->resources |= bit;

	DEB_D(("res: get 0x%02x, cur:0x%02x\n",bit,vv->resources));

	DEB_D("res: get 0x%02x, cur:0x%02x\n", bit, vv->resources);

	return 1;

}
@@ -36,7 +40,7 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits) 


	fh->resources &= ~bits;

	vv->resources &= ~bits;

	DEB_D(("res: put 0x%02x, cur:0x%02x\n",bits,vv->resources));

	DEB_D("res: put 0x%02x, cur:0x%02x\n", bits, vv->resources);

}
@@ -47,7 +51,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q, 
						struct saa7146_buf *buf)

{

	struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);

	DEB_EE(("dev:%p, buf:%p\n",dev,buf));

	DEB_EE("dev:%p, buf:%p\n", dev, buf);



	BUG_ON(in_interrupt());
@@ -66,18 +70,19 @@ int saa7146_buffer_queue(struct saa7146_dev *dev, 
			 struct saa7146_buf *buf)

{

	assert_spin_locked(&dev->slock);

	DEB_EE(("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf));

	DEB_EE("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf);



	BUG_ON(!q);



	if (NULL == q->curr) {

		q->curr = buf;

		DEB_D(("immediately activating buffer %p\n", buf));

		DEB_D("immediately activating buffer %p\n", buf);

		buf->activate(dev,buf,NULL);

	} else {

		list_add_tail(&buf->vb.queue,&q->queue);

		buf->vb.state = VIDEOBUF_QUEUED;

		DEB_D(("adding buffer %p to queue. (active buffer present)\n", buf));

		DEB_D("adding buffer %p to queue. (active buffer present)\n",

		      buf);

	}

	return 0;

}
@@ -87,14 +92,14 @@ void saa7146_buffer_finish(struct saa7146_dev *dev, 
			   int state)

{

	assert_spin_locked(&dev->slock);

	DEB_EE(("dev:%p, dmaq:%p, state:%d\n", dev, q, state));

	DEB_EE(("q->curr:%p\n",q->curr));

	DEB_EE("dev:%p, dmaq:%p, state:%d\n", dev, q, state);

	DEB_EE("q->curr:%p\n", q->curr);



	BUG_ON(!q->curr);



	/* finish current buffer */

	if (NULL == q->curr) {

		DEB_D(("aiii. no current buffer\n"));

		DEB_D("aiii. no current buffer\n");

		return;

	}
@@ -112,7 +117,7 @@ void saa7146_buffer_next(struct saa7146_dev *dev, 


	BUG_ON(!q);



	DEB_INT(("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi));

	DEB_INT("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi);



	assert_spin_locked(&dev->slock);

	if (!list_empty(&q->queue)) {
@@ -122,10 +127,11 @@ void saa7146_buffer_next(struct saa7146_dev *dev, 
		if (!list_empty(&q->queue))

			next = list_entry(q->queue.next,struct saa7146_buf, vb.queue);

		q->curr = buf;

		DEB_INT(("next buffer: buf:%p, prev:%p, next:%p\n", buf, q->queue.prev,q->queue.next));

		DEB_INT("next buffer: buf:%p, prev:%p, next:%p\n",

			buf, q->queue.prev, q->queue.next);

		buf->activate(dev,buf,next);

	} else {

		DEB_INT(("no next buffer. stopping.\n"));

		DEB_INT("no next buffer. stopping.\n");

		if( 0 != vbi ) {

			/* turn off video-dma3 */

			saa7146_write(dev,MC1, MASK_20);
@@ -162,11 +168,11 @@ void saa7146_buffer_timeout(unsigned long data) 
	struct saa7146_dev *dev = q->dev;

	unsigned long flags;



	DEB_EE(("dev:%p, dmaq:%p\n", dev, q));

	DEB_EE("dev:%p, dmaq:%p\n", dev, q);



	spin_lock_irqsave(&dev->slock,flags);

	if (q->curr) {

		DEB_D(("timeout on %p\n", q->curr));

		DEB_D("timeout on %p\n", q->curr);

		saa7146_buffer_finish(dev,q,VIDEOBUF_ERROR);

	}
@@ -194,12 +200,12 @@ static int fops_open(struct file *file) 


	enum v4l2_buf_type type;



	DEB_EE(("file:%p, dev:%s\n", file, video_device_node_name(vdev)));

	DEB_EE("file:%p, dev:%s\n", file, video_device_node_name(vdev));



	if (mutex_lock_interruptible(&saa7146_devices_lock))

		return -ERESTARTSYS;



	DEB_D(("using: %p\n",dev));

	DEB_D("using: %p\n", dev);



	type = vdev->vfl_type == VFL_TYPE_GRABBER

	     ? V4L2_BUF_TYPE_VIDEO_CAPTURE
@@ -207,7 +213,7 @@ static int fops_open(struct file *file) 


	/* check if an extension is registered */

	if( NULL == dev->ext ) {

		DEB_S(("no extension registered for this device.\n"));

		DEB_S("no extension registered for this device\n");

		result = -ENODEV;

		goto out;

	}
@@ -215,7 +221,7 @@ static int fops_open(struct file *file) 
	/* allocate per open data */

	fh = kzalloc(sizeof(*fh),GFP_KERNEL);

	if (NULL == fh) {

		DEB_S(("cannot allocate memory for per open data.\n"));

		DEB_S("cannot allocate memory for per open data\n");

		result = -ENOMEM;

		goto out;

	}
@@ -225,13 +231,13 @@ static int fops_open(struct file *file) 
	fh->type = type;



	if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {

		DEB_S(("initializing vbi...\n"));

		DEB_S("initializing vbi...\n");

		if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)

			result = saa7146_vbi_uops.open(dev,file);

		if (dev->ext_vv_data->vbi_fops.open)

			dev->ext_vv_data->vbi_fops.open(file);

	} else {

		DEB_S(("initializing video...\n"));

		DEB_S("initializing video...\n");

		result = saa7146_video_uops.open(dev,file);

	}
@@ -259,7 +265,7 @@ static int fops_release(struct file *file) 
	struct saa7146_fh  *fh  = file->private_data;

	struct saa7146_dev *dev = fh->dev;



	DEB_EE(("file:%p\n", file));

	DEB_EE("file:%p\n", file);



	if (mutex_lock_interruptible(&saa7146_devices_lock))

		return -ERESTARTSYS;
@@ -289,12 +295,14 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma) 


	switch (fh->type) {

	case V4L2_BUF_TYPE_VIDEO_CAPTURE: {

		DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, vma:%p\n",file, vma));

		DEB_EE("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, vma:%p\n",

		       file, vma);

		q = &fh->video_q;

		break;

		}

	case V4L2_BUF_TYPE_VBI_CAPTURE: {

		DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, vma:%p\n",file, vma));

		DEB_EE("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, vma:%p\n",

		       file, vma);

		q = &fh->vbi_q;

		break;

		}
@@ -312,14 +320,14 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait) 
	struct videobuf_buffer *buf = NULL;

	struct videobuf_queue *q;



	DEB_EE(("file:%p, poll:%p\n",file, wait));

	DEB_EE("file:%p, poll:%p\n", file, wait);



	if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {

		if( 0 == fh->vbi_q.streaming )

			return videobuf_poll_stream(file, &fh->vbi_q, wait);

		q = &fh->vbi_q;

	} else {

		DEB_D(("using video queue.\n"));

		DEB_D("using video queue\n");

		q = &fh->video_q;

	}
@@ -327,17 +335,17 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait) 
		buf = list_entry(q->stream.next, struct videobuf_buffer, stream);



	if (!buf) {

		DEB_D(("buf == NULL!\n"));

		DEB_D("buf == NULL!\n");

		return POLLERR;

	}



	poll_wait(file, &buf->done, wait);

	if (buf->state == VIDEOBUF_DONE || buf->state == VIDEOBUF_ERROR) {

		DEB_D(("poll succeeded!\n"));

		DEB_D("poll succeeded!\n");

		return POLLIN|POLLRDNORM;

	}



	DEB_D(("nothing to poll for, buf->state:%d\n",buf->state));

	DEB_D("nothing to poll for, buf->state:%d\n", buf->state);

	return 0;

}
@@ -346,18 +354,20 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof 
	struct saa7146_fh *fh = file->private_data;



	switch (fh->type) {

	case V4L2_BUF_TYPE_VIDEO_CAPTURE: {

//		DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, data:%p, count:%lun", file, data, (unsigned long)count));

	case V4L2_BUF_TYPE_VIDEO_CAPTURE:

/*

		DEB_EE("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, data:%p, count:%lun",

		       file, data, (unsigned long)count);

*/

		return saa7146_video_uops.read(file,data,count,ppos);

		}

	case V4L2_BUF_TYPE_VBI_CAPTURE: {

//		DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n", file, data, (unsigned long)count));

	case V4L2_BUF_TYPE_VBI_CAPTURE:

/*

		DEB_EE("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n",

		       file, data, (unsigned long)count);

*/

		if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)

			return saa7146_vbi_uops.read(file,data,count,ppos);

		else

		return -EINVAL;

		}

		break;

	default:

		BUG();

		return 0;
@@ -398,22 +408,22 @@ static void vv_callback(struct saa7146_dev *dev, unsigned long status) 
{

	u32 isr = status;



	DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));

	DEB_INT("dev:%p, isr:0x%08x\n", dev, (u32)status);



	if (0 != (isr & (MASK_27))) {

		DEB_INT(("irq: RPS0 (0x%08x).\n",isr));

		DEB_INT("irq: RPS0 (0x%08x)\n", isr);

		saa7146_video_uops.irq_done(dev,isr);

	}



	if (0 != (isr & (MASK_28))) {

		u32 mc2 = saa7146_read(dev, MC2);

		if( 0 != (mc2 & MASK_15)) {

			DEB_INT(("irq: RPS1 vbi workaround (0x%08x).\n",isr));

			DEB_INT("irq: RPS1 vbi workaround (0x%08x)\n", isr);

			wake_up(&dev->vv_data->vbi_wq);

			saa7146_write(dev,MC2, MASK_31);

			return;

		}

		DEB_INT(("irq: RPS1 (0x%08x).\n",isr));

		DEB_INT("irq: RPS1 (0x%08x)\n", isr);

		saa7146_vbi_uops.irq_done(dev,isr);

	}

}
@@ -429,13 +439,13 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) 


	vv = kzalloc(sizeof(struct saa7146_vv), GFP_KERNEL);

	if (vv == NULL) {

		ERR(("out of memory. aborting.\n"));

		ERR("out of memory. aborting.\n");

		return -ENOMEM;

	}

	ext_vv->ops = saa7146_video_ioctl_ops;

	ext_vv->core_ops = &saa7146_video_ioctl_ops;



	DEB_EE(("dev:%p\n",dev));

	DEB_EE("dev:%p\n", dev);



	/* set default values for video parts of the saa7146 */

	saa7146_write(dev, BCS_CTRL, 0x80400040);
@@ -450,7 +460,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) 


	vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);

	if( NULL == vv->d_clipping.cpu_addr ) {

		ERR(("out of memory. aborting.\n"));

		ERR("out of memory. aborting.\n");

		kfree(vv);

		return -1;

	}
@@ -471,7 +481,7 @@ int saa7146_vv_release(struct saa7146_dev* dev) 
{

	struct saa7146_vv *vv = dev->vv_data;



	DEB_EE(("dev:%p\n",dev));

	DEB_EE("dev:%p\n", dev);



	v4l2_device_unregister(&dev->v4l2_dev);

	pci_free_consistent(dev->pci, SAA7146_CLIPPING_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
@@ -490,7 +500,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, 
	int err;

	int i;



	DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type));

	DEB_EE("dev:%p, name:'%s', type:%d\n", dev, name, type);



	// released by vfd->release

	vfd = video_device_alloc();
@@ -509,13 +519,13 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, 


	err = video_register_device(vfd, type, -1);

	if (err < 0) {

		ERR(("cannot register v4l2 device. skipping.\n"));

		ERR("cannot register v4l2 device. skipping.\n");

		video_device_release(vfd);

		return err;

	}



	INFO(("%s: registered device %s [v4l2]\n",

		dev->name, video_device_node_name(vfd)));

	pr_info("%s: registered device %s [v4l2]\n",

		dev->name, video_device_node_name(vfd));



	*vid = vfd;

	return 0;
@@ -524,7 +534,7 @@ EXPORT_SYMBOL_GPL(saa7146_register_device); 


int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)

{

	DEB_EE(("dev:%p\n",dev));

	DEB_EE("dev:%p\n", dev);



	video_unregister_device(*vid);

	*vid = NULL;

drivers/media/common/saa7146_hlp.c

+8 −6
Original line number Diff line number Diff line 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <media/saa7146_vv.h>
@@ -711,8 +713,8 @@ static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa71 


	int depth = sfmt->depth;



	DEB_CAP(("[size=%dx%d,fields=%s]\n",

		width,height,v4l2_field_names[field]));

	DEB_CAP("[size=%dx%d,fields=%s]\n",

		width, height, v4l2_field_names[field]);



	if( bytesperline != 0) {

		vdma1.pitch = bytesperline*2;
@@ -837,8 +839,8 @@ static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa71 
	BUG_ON(0 == buf->pt[1].dma);

	BUG_ON(0 == buf->pt[2].dma);



	DEB_CAP(("[size=%dx%d,fields=%s]\n",

		width,height,v4l2_field_names[field]));

	DEB_CAP("[size=%dx%d,fields=%s]\n",

		width, height, v4l2_field_names[field]);



	/* fixme: look at bytesperline! */
@@ -998,12 +1000,12 @@ void saa7146_set_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, struc 
	struct saa7146_vv *vv = dev->vv_data;

	u32 vdma1_prot_addr;



	DEB_CAP(("buf:%p, next:%p\n",buf,next));

	DEB_CAP("buf:%p, next:%p\n", buf, next);



	vdma1_prot_addr = saa7146_read(dev, PROT_ADDR1);

	if( 0 == vdma1_prot_addr ) {

		/* clear out beginning of streaming bit (rps register 0)*/

		DEB_CAP(("forcing sync to new frame\n"));

		DEB_CAP("forcing sync to new frame\n");

		saa7146_write(dev, MC2, MASK_27 );

	}

drivers/media/common/saa7146_i2c.c

+31 −29
Original line number Diff line number Diff line 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <media/saa7146_vv.h>



static u32 saa7146_i2c_func(struct i2c_adapter *adapter)

{

//fm	DEB_I2C(("'%s'.\n", adapter->name));

	/* DEB_I2C("'%s'\n", adapter->name); */



	return	  I2C_FUNC_I2C

		| I2C_FUNC_SMBUS_QUICK
@@ -14,9 +16,7 @@ static u32 saa7146_i2c_func(struct i2c_adapter *adapter) 
static inline u32 saa7146_i2c_status(struct saa7146_dev *dev)

{

	u32 iicsta = saa7146_read(dev, I2C_STATUS);

/*

	DEB_I2C(("status: 0x%08x\n",iicsta));

*/

	/* DEB_I2C("status: 0x%08x\n", iicsta); */

	return iicsta;

}
@@ -39,10 +39,11 @@ static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, __le32 *op) 
	   plus one extra byte to address the device */

	mem = 1 + ((mem-1) / 3);



	/* we assume that op points to a memory of at least SAA7146_I2C_MEM bytes

	   size. if we exceed this limit... */

	/* we assume that op points to a memory of at least

	 * SAA7146_I2C_MEM bytes size. if we exceed this limit...

	 */

	if ((4 * mem) > SAA7146_I2C_MEM) {

//fm		DEB_I2C(("cannot prepare i2c-message.\n"));

		/* DEB_I2C("cannot prepare i2c-message\n"); */

		return -ENOMEM;

	}
@@ -123,7 +124,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev) 
	if ( 0 != ( status & SAA7146_I2C_BUSY) ) {



		/* yes, kill ongoing operation */

		DEB_I2C(("busy_state detected.\n"));

		DEB_I2C("busy_state detected\n");



		/* set "ABORT-OPERATION"-bit (bit 7)*/

		saa7146_write(dev, I2C_STATUS, (dev->i2c_bitrate | MASK_07));
@@ -141,7 +142,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev) 


	if ( dev->i2c_bitrate != status ) {



		DEB_I2C(("error_state detected. status:0x%08x\n",status));

		DEB_I2C("error_state detected. status:0x%08x\n", status);



		/* Repeat the abort operation. This seems to be necessary

		   after serious protocol errors caused by e.g. the SAA7740 */
@@ -164,7 +165,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev) 
	/* if any error is still present, a fatal error has occurred ... */

	status = saa7146_i2c_status(dev);

	if ( dev->i2c_bitrate != status ) {

		DEB_I2C(("fatal error. status:0x%08x\n",status));

		DEB_I2C("fatal error. status:0x%08x\n", status);

		return -1;

	}
@@ -181,7 +182,8 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor 
	unsigned long timeout;



	/* write out i2c-command */

	DEB_I2C(("before: 0x%08x (status: 0x%08x), %d\n",*dword,saa7146_read(dev, I2C_STATUS), dev->i2c_op));

	DEB_I2C("before: 0x%08x (status: 0x%08x), %d\n",

		*dword, saa7146_read(dev, I2C_STATUS), dev->i2c_op);



	if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) {
@@ -202,7 +204,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor 
				/* a signal arrived */

				return -ERESTARTSYS;



			printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n",

			pr_warn("%s %s [irq]: timed out waiting for end of xfer\n",

				dev->name, __func__);

			return -EIO;

		}
@@ -220,7 +222,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor 
				break;

			}

			if (time_after(jiffies,timeout)) {

				printk(KERN_WARNING "%s %s: timed out waiting for MC2\n",

				pr_warn("%s %s: timed out waiting for MC2\n",

					dev->name, __func__);

				return -EIO;

			}
@@ -237,7 +239,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor 
				/* this is normal when probing the bus

				 * (no answer from nonexisistant device...)

				 */

				printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n",

				pr_warn("%s %s [poll]: timed out waiting for end of xfer\n",

					dev->name, __func__);

				return -EIO;

			}
@@ -257,24 +259,24 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor 
		if ( 0 == (status & SAA7146_I2C_ERR) ||

		     0 == (status & SAA7146_I2C_BUSY) ) {

			/* it may take some time until ERR goes high - ignore */

			DEB_I2C(("unexpected i2c status %04x\n", status));

			DEB_I2C("unexpected i2c status %04x\n", status);

		}

		if( 0 != (status & SAA7146_I2C_SPERR) ) {

			DEB_I2C(("error due to invalid start/stop condition.\n"));

			DEB_I2C("error due to invalid start/stop condition\n");

		}

		if( 0 != (status & SAA7146_I2C_DTERR) ) {

			DEB_I2C(("error in data transmission.\n"));

			DEB_I2C("error in data transmission\n");

		}

		if( 0 != (status & SAA7146_I2C_DRERR) ) {

			DEB_I2C(("error when receiving data.\n"));

			DEB_I2C("error when receiving data\n");

		}

		if( 0 != (status & SAA7146_I2C_AL) ) {

			DEB_I2C(("error because arbitration lost.\n"));

			DEB_I2C("error because arbitration lost\n");

		}



		/* we handle address-errors here */

		if( 0 != (status & SAA7146_I2C_APERR) ) {

			DEB_I2C(("error in address phase.\n"));

			DEB_I2C("error in address phase\n");

			return -EREMOTEIO;

		}
@@ -284,7 +286,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor 
	/* read back data, just in case we were reading ... */

	*dword = cpu_to_le32(saa7146_read(dev, I2C_TRANSFER));



	DEB_I2C(("after: 0x%08x\n",*dword));

	DEB_I2C("after: 0x%08x\n", *dword);

	return 0;

}
@@ -299,7 +301,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m 
		return -ERESTARTSYS;



	for(i=0;i<num;i++) {

		DEB_I2C(("msg:%d/%d\n",i+1,num));

		DEB_I2C("msg:%d/%d\n", i+1, num);

	}



	/* prepare the message(s), get number of u32s to transfer */
@@ -316,7 +318,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m 
		/* reset the i2c-device if necessary */

		err = saa7146_i2c_reset(dev);

		if ( 0 > err ) {

			DEB_I2C(("could not reset i2c-device.\n"));

			DEB_I2C("could not reset i2c-device\n");

			goto out;

		}
@@ -336,7 +338,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m 
				   address error and trust the saa7146 address error detection. */

				if (-EREMOTEIO == err && 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags))

					goto out;

				DEB_I2C(("error while sending message(s). starting again.\n"));

				DEB_I2C("error while sending message(s). starting again\n");

				break;

			}

		}
@@ -356,13 +358,13 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m 


	/* if any things had to be read, get the results */

	if ( 0 != saa7146_i2c_msg_cleanup(msgs, num, buffer)) {

		DEB_I2C(("could not cleanup i2c-message.\n"));

		DEB_I2C("could not cleanup i2c-message\n");

		err = -1;

		goto out;

	}



	/* return the number of delivered messages */

	DEB_I2C(("transmission successful. (msg:%d).\n",err));

	DEB_I2C("transmission successful. (msg:%d)\n", err);

out:

	/* another bug in revision 0: the i2c-registers get uploaded randomly by other

	   uploads, so we better clear them out before continuing */
@@ -370,7 +372,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m 
		__le32 zero = 0;

		saa7146_i2c_reset(dev);

		if( 0 != saa7146_i2c_writeout(dev, &zero, short_delay)) {

			INFO(("revision 0 error. this should never happen.\n"));

			pr_info("revision 0 error. this should never happen\n");

		}

	}
@@ -400,7 +402,7 @@ static struct i2c_algorithm saa7146_algo = { 


int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate)

{

	DEB_EE(("bitrate: 0x%08x\n",bitrate));

	DEB_EE("bitrate: 0x%08x\n", bitrate);



	/* enable i2c-port pins */

	saa7146_write(dev, MC1, (MASK_08 | MASK_24));

drivers/media/common/saa7146_vbi.c

+25 −23

File changed.

Preview size limit exceeded, changes collapsed.