media: zoran: convert dprintk info to pci_info (9bb27202) · Commits · 戴 / test

drivers/staging/media/zoran/zoran_card.c

+15 −31

Original line number	Diff line number	Diff line
		@@ -892,9 +892,9 @@ static void test_interrupts(struct zoran *zr)
		btwrite(0, ZR36057_ICR);
		btwrite(0x78000000, ZR36057_ISR);
		zr->testing = 0;
		dprintk(5, KERN_INFO "%s: Testing interrupts...\n", ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "Testing interrupts...\n");
		if (timeout)
		dprintk(1, ": time spent: %d\n", 1 * HZ - timeout);
		pci_info(zr->pci_dev, ": time spent: %d\n", 1 * HZ - timeout);
		if (zr36067_debug > 1)
		print_interrupts(zr);
		btwrite(icr, ZR36057_ICR);
		@@ -904,10 +904,7 @@ static int zr36057_init(struct zoran *zr)
		{
		int j, err;

		dprintk(1,
		KERN_INFO
		"%s: %s - initializing card[%d], zr=%p\n",
		ZR_DEVNAME(zr), __func__, zr->id, zr);
		pci_info(zr->pci_dev, "initializing card[%d]\n", zr->id);

		/* default setup of all parameters which will persist between opens */
		zr->user = 0;
		@@ -1140,18 +1137,12 @@ static int zoran_probe(struct pci_dev pdev, const struct pci_device_id ent)
		goto zr_unreg;
		zr->revision = zr->pci_dev->revision;

		dprintk(1,
		KERN_INFO
		"%s: Zoran ZR360%c7 (rev %d), irq: %d, memory: 0x%08llx\n",
		ZR_DEVNAME(zr), zr->revision < 2 ? '5' : '6', zr->revision,
		pci_info(zr->pci_dev, "Zoran ZR360%c7 (rev %d), irq: %d, memory: 0x%08llx\n",
		zr->revision < 2 ? '5' : '6', zr->revision,
		zr->pci_dev->irq, (uint64_t)pci_resource_start(zr->pci_dev, 0));
		if (zr->revision >= 2) {
		dprintk(1,
		KERN_INFO
		"%s: Subsystem vendor=0x%04x id=0x%04x\n",
		ZR_DEVNAME(zr), zr->pci_dev->subsystem_vendor,
		zr->pci_dev->subsystem_device);
		}
		if (zr->revision >= 2)
		pci_info(zr->pci_dev, "Subsystem vendor=0x%04x id=0x%04x\n",
		zr->pci_dev->subsystem_vendor, zr->pci_dev->subsystem_device);

		/* Use auto-detected card type? */
		if (card[nr] == -1) {
		@@ -1215,14 +1206,13 @@ static int zoran_probe(struct pci_dev pdev, const struct pci_device_id ent)
		&latency);
		need_latency = zr->revision > 1 ? 32 : 48;
		if (latency != need_latency) {
		dprintk(2, KERN_INFO "%s: Changing PCI latency from %d to %d\n",
		ZR_DEVNAME(zr), latency, need_latency);
		pci_info(zr->pci_dev, "Changing PCI latency from %d to %d\n", latency, need_latency);
		pci_write_config_byte(zr->pci_dev, PCI_LATENCY_TIMER, need_latency);
		}

		zr36057_restart(zr);
		/* i2c */
		dprintk(2, KERN_INFO "%s: Initializing i2c bus...\n", ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "Initializing i2c bus...\n");

		if (zoran_register_i2c(zr) < 0) {
		pci_err(pdev, "%s - can't initialize i2c bus\n", __func__);
		@@ -1238,7 +1228,7 @@ static int zoran_probe(struct pci_dev pdev, const struct pci_device_id ent)
		zr->card.i2c_encoder, 0,
		zr->card.addrs_encoder);

		dprintk(2, KERN_INFO "%s: Initializing videocodec bus...\n", ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "Initializing videocodec bus...\n");

		if (zr->card.video_codec) {
		codec_name = codecid_to_modulename(zr->card.video_codec);
		@@ -1294,9 +1284,7 @@ static int zoran_probe(struct pci_dev pdev, const struct pci_device_id ent)
		/* take care of Natoma chipset and a revision 1 zr36057 */
		if ((pci_pci_problems & PCIPCI_NATOMA) && zr->revision <= 1) {
		zr->jpg_buffers.need_contiguous = 1;
		dprintk(1, KERN_INFO
		"%s: ZR36057/Natoma bug, max. buffer size is 128K\n",
		ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "ZR36057/Natoma bug, max. buffer size is 128K\n");
		}

		if (zr36057_init(zr) < 0)
		@@ -1365,12 +1353,8 @@ static int __init zoran_init(void)
		if (jpg_bufsize > (512 * 1024))
		jpg_bufsize = 512 * 1024;
		/* Use parameter for vidmem or try to find a video card */
		if (vidmem) {
		dprintk(1,
		KERN_INFO
		"%s: Using supplied video memory base address @ 0x%lx\n",
		ZORAN_NAME, vidmem);
		}
		if (vidmem)
		pr_info("%s: Using supplied video memory base address @ 0x%lx\n", ZORAN_NAME, vidmem);

		/* some mainboards might not do PCI-PCI data transfer well */
		if (pci_pci_problems & (PCIPCI_FAIL \| PCIAGP_FAIL \| PCIPCI_ALIMAGIK))

drivers/staging/media/zoran/zoran_device.c

+8 −19

Original line number	Diff line number	Diff line
		@@ -118,8 +118,7 @@ int post_office_wait(struct zoran *zr)
		}
		if ((por & ZR36057_POR_POTime) && !zr->card.gws_not_connected) {
		/* In LML33/BUZ \GWS line is not connected, so it has always timeout set */
		dprintk(1, KERN_INFO "%s: pop timeout %08x\n", ZR_DEVNAME(zr),
		por);
		pci_info(zr->pci_dev, "pop timeout %08x\n", por);
		return -1;
		}

		@@ -218,16 +217,10 @@ void jpeg_codec_sleep(struct zoran *zr, int sleep)
		{
		GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_SLEEP], !sleep);
		if (!sleep) {
		dprintk(3,
		KERN_INFO
		"%s: %s() - wake GPIO=0x%08x\n",
		ZR_DEVNAME(zr), __func__, btread(ZR36057_GPPGCR1));
		pci_dbg(zr->pci_dev, "%s() - wake GPIO=0x%08x\n", __func__, btread(ZR36057_GPPGCR1));
		udelay(500);
		} else {
		dprintk(3,
		KERN_INFO
		"%s: %s() - sleep GPIO=0x%08x\n",
		ZR_DEVNAME(zr), __func__, btread(ZR36057_GPPGCR1));
		pci_dbg(zr->pci_dev, "%s() - sleep GPIO=0x%08x\n", __func__, btread(ZR36057_GPPGCR1));
		udelay(2);
		}
		}
		@@ -309,8 +302,7 @@ static void zr36057_set_vfe(struct zoran *zr, int video_width, int video_height,
		Wa = tvn->Wa;
		Ha = tvn->Ha;

		dprintk(2, KERN_INFO "%s: set_vfe() - width = %d, height = %d\n",
		ZR_DEVNAME(zr), video_width, video_height);
		pci_info(zr->pci_dev, "set_vfe() - width = %d, height = %d\n", video_width, video_height);

		if (video_width < BUZ_MIN_WIDTH \|\|
		video_height < BUZ_MIN_HEIGHT \|\|
		@@ -948,8 +940,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
		zr36057_set_jpg(zr, mode); // \P_Reset, ... Video param, FIFO

		clear_interrupt_counters(zr);
		dprintk(2, KERN_INFO "%s: enable_jpg(MOTION_COMPRESS)\n",
		ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "enable_jpg(MOTION_COMPRESS)\n");
		break;
		}

		@@ -978,8 +969,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
		zr36057_set_jpg(zr, mode); // \P_Reset, ... Video param, FIFO

		clear_interrupt_counters(zr);
		dprintk(2, KERN_INFO "%s: enable_jpg(MOTION_DECOMPRESS)\n",
		ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "enable_jpg(MOTION_DECOMPRESS)\n");
		break;

		case BUZ_MODE_IDLE:
		@@ -1006,7 +996,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
		decoder_call(zr, video, s_stream, 1);
		encoder_call(zr, video, s_routing, 0, 0, 0);

		dprintk(2, KERN_INFO "%s: enable_jpg(IDLE)\n", ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "enable_jpg(IDLE)\n");
		break;
		}
		}
		@@ -1128,8 +1118,7 @@ static void zoran_restart(struct zoran *zr)
		jpeg_start(zr);

		if (zr->num_errors <= 8)
		dprintk(2, KERN_INFO "%s: Restart\n",
		ZR_DEVNAME(zr));
		pci_info(zr->pci_dev, "Restart\n");

		zr->JPEG_missed = 0;
		zr->JPEG_error = 2;

drivers/staging/media/zoran/zoran_driver.c

+13 −21

Original line number	Diff line number	Diff line
		@@ -225,10 +225,7 @@ static int v4l_fbuffer_alloc(struct zoran_fh *fh)
		for (off = 0; off < fh->buffers.buffer_size;
		off += PAGE_SIZE)
		SetPageReserved(virt_to_page(mem + off));
		dprintk(4,
		KERN_INFO
		"%s: %s - V4L frame %d mem %p (bus: 0x%llx)\n",
		ZR_DEVNAME(zr), __func__, i, mem,
		pci_info(zr->pci_dev, "%s - V4L frame %d mem %p (bus: 0x%llx)\n", __func__, i, mem,
		(unsigned long long)virt_to_bus(mem));
		}

		@@ -244,7 +241,7 @@ static void v4l_fbuffer_free(struct zoran_fh *fh)
		int i, off;
		unsigned char *mem;

		dprintk(4, KERN_INFO "%s: %s\n", ZR_DEVNAME(zr), __func__);
		pci_dbg(zr->pci_dev, "%s\n", __func__);

		for (i = 0; i < fh->buffers.num_buffers; i++) {
		if (!fh->buffers.buffer[i].v4l.fbuffer)
		@@ -820,8 +817,8 @@ static int zoran_open(struct file *file)
		struct zoran_fh *fh;
		int res, first_open = 0;

		dprintk(2, KERN_INFO "%s: %s(%s, pid=[%d]), users(-)=%d\n",
		ZR_DEVNAME(zr), __func__, current->comm, task_pid_nr(current), zr->user + 1);
		pci_info(zr->pci_dev, "%s(%s, pid=[%d]), users(-)=%d\n", __func__, current->comm,
		task_pid_nr(current), zr->user + 1);

		mutex_lock(&zr->lock);

		@@ -876,8 +873,7 @@ fail_fh:
		fail_unlock:
		mutex_unlock(&zr->lock);

		dprintk(2, KERN_INFO "%s: open failed (%d), users(-)=%d\n",
		ZR_DEVNAME(zr), res, zr->user);
		pci_info(zr->pci_dev, "open failed (%d), users(-)=%d\n", res, zr->user);

		return res;
		}
		@@ -887,8 +883,8 @@ static int zoran_close(struct file *file)
		struct zoran_fh *fh = file->private_data;
		struct zoran *zr = fh->zr;

		dprintk(2, KERN_INFO "%s: %s(%s, pid=[%d]), users(+)=%d\n",
		ZR_DEVNAME(zr), __func__, current->comm, task_pid_nr(current), zr->user - 1);
		pci_info(zr->pci_dev, "%s(%s, pid=[%d]), users(+)=%d\n", __func__, current->comm,
		task_pid_nr(current), zr->user - 1);

		/* kernel locks (fs/device.c), so don't do that ourselves
		* (prevents deadlocks) */
		@@ -933,7 +929,7 @@ static int zoran_close(struct file *file)
		kfree(fh->overlay_mask);
		kfree(fh);

		dprintk(4, KERN_INFO "%s: %s done\n", ZR_DEVNAME(zr), __func__);
		pci_dbg(zr->pci_dev, "%s done\n", __func__);

		return 0;
		}
		@@ -2390,8 +2386,7 @@ static void zoran_vm_close(struct vm_area_struct *vma)
		struct zoran *zr = fh->zr;
		int i;

		dprintk(3, KERN_INFO "%s: %s - munmap(%s)\n", ZR_DEVNAME(zr),
		__func__, mode_name(fh->map_mode));
		pci_info(zr->pci_dev, "%s - munmap(%s)\n", ZR_DEVNAME(zr), mode_name(fh->map_mode));

		for (i = 0; i < fh->buffers.num_buffers; i++) {
		if (fh->buffers.buffer[i].map == map)
		@@ -2405,8 +2400,7 @@ static void zoran_vm_close(struct vm_area_struct *vma)
		return;
		}

		dprintk(3, KERN_INFO "%s: %s - free %s buffers\n", ZR_DEVNAME(zr),
		__func__, mode_name(fh->map_mode));
		pci_info(zr->pci_dev, "%s - free %s buffers\n", __func__, mode_name(fh->map_mode));

		if (fh->map_mode == ZORAN_MAP_MODE_RAW) {
		if (fh->buffers.active != ZORAN_FREE) {
		@@ -2446,9 +2440,7 @@ static int zoran_mmap(struct file file, struct vm_area_struct vma)
		struct zoran_mapping *map;
		int res = 0;

		dprintk(3,
		KERN_INFO "%s: %s(%s) of 0x%08lx-0x%08lx (size=%lu)\n",
		ZR_DEVNAME(zr), __func__,
		pci_info(zr->pci_dev, "%s(%s) of 0x%08lx-0x%08lx (size=%lu)\n", __func__,
		mode_name(fh->map_mode), vma->vm_start, vma->vm_end, size);

		if (!(vma->vm_flags & VM_SHARED) \|\| !(vma->vm_flags & VM_READ) \|\|

Admin message