diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-09-28 19:07:59 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-09-28 19:07:59 +0000 |
| commit | 897f56f591efd9ae16f2a7a70bc4e60b344a17d3 (patch) | |
| tree | 1924cf725f9e9cf7477a1d20cb1c1da64707f1bf /linux/drivers/media | |
| parent | bb84958b07672daf56431357848fdc0d2bea2fcc (diff) | |
| download | mediapointer-dvb-s2-897f56f591efd9ae16f2a7a70bc4e60b344a17d3.tar.gz mediapointer-dvb-s2-897f56f591efd9ae16f2a7a70bc4e60b344a17d3.tar.bz2 | |
* bttv-driver.c: (set_pll):
* bttvp.h:
- Rename vprintk to verbose_printk to fix name clash.
Signed-off-by: Bernd Petrovitsch <bernd@firmix.at>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 12 | ||||
| -rw-r--r-- | linux/drivers/media/video/bttvp.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 1ff494297..cb9e1c7ba 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.58 2005/09/13 16:33:03 mkrufky Exp $ + $Id: bttv-driver.c,v 1.59 2005/09/28 19:07:59 nsh Exp $ bttv - Bt848 frame grabber driver @@ -774,7 +774,7 @@ static void set_pll(struct bttv *btv) /* no PLL needed */ if (btv->pll.pll_current == 0) return; - vprintk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", + verbose_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", btv->c.nr,btv->pll.pll_ifreq); btwrite(0x00,BT848_TGCTRL); btwrite(0x00,BT848_PLL_XCI); @@ -782,13 +782,13 @@ static void set_pll(struct bttv *btv) return; } - vprintk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, + verbose_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, btv->pll.pll_ifreq, btv->pll.pll_ofreq); set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq); for (i=0; i<10; i++) { /* Let other people run while the PLL stabilizes */ - vprintk("."); + verbose_printk("."); msleep(10); if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) { @@ -796,12 +796,12 @@ static void set_pll(struct bttv *btv) } else { btwrite(0x08,BT848_TGCTRL); btv->pll.pll_current = btv->pll.pll_ofreq; - vprintk(" ok\n"); + verbose_printk(" ok\n"); return; } } btv->pll.pll_current = -1; - vprintk("failed\n"); + verbose_printk("failed\n"); return; } diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h index d12c21635..befe6834d 100644 --- a/linux/drivers/media/video/bttvp.h +++ b/linux/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.21 2005/07/15 21:44:14 mchehab Exp $ + $Id: bttvp.h,v 1.22 2005/09/28 19:07:59 nsh Exp $ bttv - Bt848 frame grabber driver @@ -235,9 +235,9 @@ extern void bttv_gpio_tracking(struct bttv *btv, char *comment); extern int init_bttv_i2c(struct bttv *btv); extern int fini_bttv_i2c(struct bttv *btv); -#define vprintk if (bttv_verbose) printk #define dprintk if (bttv_debug >= 1) printk #define d2printk if (bttv_debug >= 2) printk +#define verbose_printk if (bttv_verbose) printk #define BTTV_MAX_FBUF 0x208000 #define VBIBUF_SIZE (2048*VBI_MAXLINES*2) |