Skip to content

L
linux
Commit 8af443e5 authored by Joe Perches's avatar Joe Perches Committed by Mauro Carvalho Chehab
Browse files
Options

[media] bt8xx: Use current logging styles 

This converts some messages that were emitted at
KERN_INFO to KERN_DEBUG.  All of these messages
were guarded by bttv_debug tests.

Add pr_fmt.
Convert printks to pr_<level>
Convert printks without KERN_<level> to appropriate pr_<level>.
Removed embedded prefixes when pr_fmt was added.
Whitespace cleanups when around other conversions.
Macros coded with if statements should be do { if... } while (0)
so the macros can be used in other if tests.
Use ##__VA_ARGS__ for variadic macro as well.
Coalesce format strings.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d8a10ac9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 355 additions and 330 deletions
drivers/media/video/bt8xx/bttv-cards.c
View file @ 8af443e5
This diff is collapsed.
drivers/media/video/bt8xx/bttv-driver.c
View file @ 8af443e5
This diff is collapsed.
drivers/media/video/bt8xx/bttv-gpio.c
View file @ 8af443e5
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -99,7 +101,7 @@ int bttv_sub_add_device(struct bttv_core *core, char *name) ...@@ -99,7 +101,7 @@ int bttv_sub_add_device(struct bttv_core *core, char *name)
kfree(sub); kfree(sub);
return err; return err;
} }
printk("bttv%d: add subdevice \"%s\"\n", core->nr, dev_name(&sub->dev)); pr_info("%d: add subdevice \"%s\"\n", core->nr, dev_name(&sub->dev));
list_add_tail(&sub->list,&core->subs); list_add_tail(&sub->list,&core->subs);
return 0; return 0;
} }
......
drivers/media/video/bt8xx/bttv-i2c.c
View file @ 8af443e5
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -154,9 +156,7 @@ bttv_i2c_sendbytes(struct bttv *btv, const struct i2c_msg *msg, int last) ...@@ -154,9 +156,7 @@ bttv_i2c_sendbytes(struct bttv *btv, const struct i2c_msg *msg, int last)
if (retval == 0) if (retval == 0)
goto eio; goto eio;
if (i2c_debug) { if (i2c_debug) {
printk(" <W %02x %02x", msg->addr << 1, msg->buf[0]); pr_cont(" <W %02x %02x", msg->addr << 1, msg->buf[0]);
if (!(xmit & BT878_I2C_NOSTOP))
printk(" >\n");
} }
for (cnt = 1; cnt < msg->len; cnt++ ) { for (cnt = 1; cnt < msg->len; cnt++ ) {
...@@ -170,19 +170,18 @@ bttv_i2c_sendbytes(struct bttv *btv, const struct i2c_msg *msg, int last) ...@@ -170,19 +170,18 @@ bttv_i2c_sendbytes(struct bttv *btv, const struct i2c_msg *msg, int last)
goto err; goto err;
if (retval == 0) if (retval == 0)
goto eio; goto eio;
if (i2c_debug) { if (i2c_debug)
printk(" %02x", msg->buf[cnt]); pr_cont(" %02x", msg->buf[cnt]);
if (!(xmit & BT878_I2C_NOSTOP))
printk(" >\n");
}
} }
if (!(xmit & BT878_I2C_NOSTOP))
pr_cont(">\n");
return msg->len; return msg->len;
eio: eio:
retval = -EIO; retval = -EIO;
err: err:
if (i2c_debug) if (i2c_debug)
printk(" ERR: %d\n",retval); pr_cont(" ERR: %d\n",retval);
return retval; return retval;
} }
...@@ -193,7 +192,7 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last) ...@@ -193,7 +192,7 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last)
u32 cnt; u32 cnt;
int retval; int retval;
for(cnt = 0; cnt < msg->len; cnt++) { for (cnt = 0; cnt < msg->len; cnt++) {
xmit = (msg->addr << 25) | (1 << 24) | I2C_HW; xmit = (msg->addr << 25) | (1 << 24) | I2C_HW;
if (cnt < msg->len-1) if (cnt < msg->len-1)
xmit |= BT848_I2C_W3B; xmit |= BT848_I2C_W3B;
...@@ -201,6 +200,12 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last) ...@@ -201,6 +200,12 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last)
xmit |= BT878_I2C_NOSTOP; xmit |= BT878_I2C_NOSTOP;
if (cnt) if (cnt)
xmit |= BT878_I2C_NOSTART; xmit |= BT878_I2C_NOSTART;
if (i2c_debug) {
if (!(xmit & BT878_I2C_NOSTART))
pr_cont(" <R %02x", (msg->addr << 1) +1);
}
btwrite(xmit, BT848_I2C); btwrite(xmit, BT848_I2C);
retval = bttv_i2c_wait_done(btv); retval = bttv_i2c_wait_done(btv);
if (retval < 0) if (retval < 0)
...@@ -209,20 +214,20 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last) ...@@ -209,20 +214,20 @@ bttv_i2c_readbytes(struct bttv *btv, const struct i2c_msg *msg, int last)
goto eio; goto eio;
msg->buf[cnt] = ((u32)btread(BT848_I2C) >> 8) & 0xff; msg->buf[cnt] = ((u32)btread(BT848_I2C) >> 8) & 0xff;
if (i2c_debug) { if (i2c_debug) {
if (!(xmit & BT878_I2C_NOSTART)) pr_cont(" =%02x", msg->buf[cnt]);
printk(" <R %02x", (msg->addr << 1) +1);
printk(" =%02x", msg->buf[cnt]);
if (!(xmit & BT878_I2C_NOSTOP))
printk(" >\n");
} }
if (i2c_debug && !(xmit & BT878_I2C_NOSTOP))
pr_cont(" >\n");
} }
return msg->len; return msg->len;
eio: eio:
retval = -EIO; retval = -EIO;
err: err:
if (i2c_debug) if (i2c_debug)
printk(" ERR: %d\n",retval); pr_cont(" ERR: %d\n",retval);
return retval; return retval;
} }
...@@ -234,7 +239,8 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int ...@@ -234,7 +239,8 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int
int i; int i;
if (i2c_debug) if (i2c_debug)
printk("bt-i2c:"); pr_debug("bt-i2c:");
btwrite(BT848_INT_I2CDONE|BT848_INT_RACK, BT848_INT_STAT); btwrite(BT848_INT_I2CDONE|BT848_INT_RACK, BT848_INT_STAT);
for (i = 0 ; i < num; i++) { for (i = 0 ; i < num; i++) {
if (msgs[i].flags & I2C_M_RD) { if (msgs[i].flags & I2C_M_RD) {
...@@ -271,20 +277,20 @@ int bttv_I2CRead(struct bttv *btv, unsigned char addr, char *probe_for) ...@@ -271,20 +277,20 @@ int bttv_I2CRead(struct bttv *btv, unsigned char addr, char *probe_for)
if (0 != btv->i2c_rc) if (0 != btv->i2c_rc)
return -1; return -1;
if (bttv_verbose && NULL != probe_for) if (bttv_verbose && NULL != probe_for)
printk(KERN_INFO "bttv%d: i2c: checking for %s @ 0x%02x... ", pr_info("%d: i2c: checking for %s @ 0x%02x... ",
btv->c.nr,probe_for,addr); btv->c.nr, probe_for, addr);
btv->i2c_client.addr = addr >> 1; btv->i2c_client.addr = addr >> 1;
if (1 != i2c_master_recv(&btv->i2c_client, &buffer, 1)) { if (1 != i2c_master_recv(&btv->i2c_client, &buffer, 1)) {
if (NULL != probe_for) { if (NULL != probe_for) {
if (bttv_verbose) if (bttv_verbose)
printk("not found\n"); pr_cont("not found\n");
} else } else
printk(KERN_WARNING "bttv%d: i2c read 0x%x: error\n", pr_warn("%d: i2c read 0x%x: error\n",
btv->c.nr,addr); btv->c.nr, addr);
return -1; return -1;
} }
if (bttv_verbose && NULL != probe_for) if (bttv_verbose && NULL != probe_for)
printk("found\n"); pr_cont("found\n");
return buffer; return buffer;
} }
...@@ -335,8 +341,8 @@ static void do_i2c_scan(char *name, struct i2c_client *c) ...@@ -335,8 +341,8 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
rc = i2c_master_recv(c,&buf,0); rc = i2c_master_recv(c,&buf,0);
if (rc < 0) if (rc < 0)
continue; continue;
printk("%s: i2c scan: found device @ 0x%x [%s]\n", pr_info("%s: i2c scan: found device @ 0x%x [%s]\n",
name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???"); name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???");
} }
} }
......
drivers/media/video/bt8xx/bttv-input.c
View file @ 8af443e5
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -36,9 +38,10 @@ static int ir_rc5_remote_gap = 885; ...@@ -36,9 +38,10 @@ static int ir_rc5_remote_gap = 885;
module_param(ir_rc5_remote_gap, int, 0644); module_param(ir_rc5_remote_gap, int, 0644);
#undef dprintk #undef dprintk
#define dprintk(arg...) do { \ #define dprintk(fmt, ...) \
if (ir_debug >= 1) \ do { \
printk(arg); \ if (ir_debug >= 1) \
pr_info(fmt, ##__VA_ARGS__); \
} while (0) } while (0)
#define DEVNAME "bttv-input" #define DEVNAME "bttv-input"
...@@ -62,7 +65,7 @@ static void ir_handle_key(struct bttv *btv) ...@@ -62,7 +65,7 @@ static void ir_handle_key(struct bttv *btv)
/* extract data */ /* extract data */
data = ir_extract_bits(gpio, ir->mask_keycode); data = ir_extract_bits(gpio, ir->mask_keycode);
dprintk(KERN_INFO DEVNAME ": irq gpio=0x%x code=%d | %s%s%s\n", dprintk("irq gpio=0x%x code=%d | %s%s%s\n",
gpio, data, gpio, data,
ir->polling ? "poll" : "irq", ir->polling ? "poll" : "irq",
(gpio & ir->mask_keydown) ? " down" : "", (gpio & ir->mask_keydown) ? " down" : "",
...@@ -96,7 +99,7 @@ static void ir_enltv_handle_key(struct bttv *btv) ...@@ -96,7 +99,7 @@ static void ir_enltv_handle_key(struct bttv *btv)
keyup = (gpio & ir->mask_keyup) ? 1 << 31 : 0; keyup = (gpio & ir->mask_keyup) ? 1 << 31 : 0;
if ((ir->last_gpio & 0x7f) != data) { if ((ir->last_gpio & 0x7f) != data) {
dprintk(KERN_INFO DEVNAME ": gpio=0x%x code=%d | %s\n", dprintk("gpio=0x%x code=%d | %s\n",
gpio, data, gpio, data,
(gpio & ir->mask_keyup) ? " up" : "up/down"); (gpio & ir->mask_keyup) ? " up" : "up/down");
...@@ -107,7 +110,7 @@ static void ir_enltv_handle_key(struct bttv *btv) ...@@ -107,7 +110,7 @@ static void ir_enltv_handle_key(struct bttv *btv)
if ((ir->last_gpio & 1 << 31) == keyup) if ((ir->last_gpio & 1 << 31) == keyup)
return; return;
dprintk(KERN_INFO DEVNAME ":(cnt) gpio=0x%x code=%d | %s\n", dprintk("(cnt) gpio=0x%x code=%d | %s\n",
gpio, data, gpio, data,
(gpio & ir->mask_keyup) ? " up" : "down"); (gpio & ir->mask_keyup) ? " up" : "down");
...@@ -177,13 +180,12 @@ static u32 bttv_rc5_decode(unsigned int code) ...@@ -177,13 +180,12 @@ static u32 bttv_rc5_decode(unsigned int code)
rc5 |= 1; rc5 |= 1;
break; break;
case 3: case 3:
dprintk(KERN_INFO DEVNAME ":rc5_decode(%x) bad code\n", dprintk("rc5_decode(%x) bad code\n",
org_code); org_code);
return 0; return 0;
} }
} }
dprintk(KERN_INFO DEVNAME ":" dprintk("code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
"code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
"instr=%x\n", rc5, org_code, RC5_START(rc5), "instr=%x\n", rc5, org_code, RC5_START(rc5),
RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5)); RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
return rc5; return rc5;
...@@ -212,20 +214,20 @@ static void bttv_rc5_timer_end(unsigned long data) ...@@ -212,20 +214,20 @@ static void bttv_rc5_timer_end(unsigned long data)
/* Allow some timer jitter (RC5 is ~24ms anyway so this is ok) */ /* Allow some timer jitter (RC5 is ~24ms anyway so this is ok) */
if (gap < 28000) { if (gap < 28000) {
dprintk(KERN_INFO DEVNAME ": spurious timer_end\n"); dprintk("spurious timer_end\n");
return; return;
} }
if (ir->last_bit < 20) { if (ir->last_bit < 20) {
/* ignore spurious codes (caused by light/other remotes) */ /* ignore spurious codes (caused by light/other remotes) */
dprintk(KERN_INFO DEVNAME ": short code: %x\n", ir->code); dprintk("short code: %x\n", ir->code);
} else { } else {
ir->code = (ir->code << ir->shift_by) | 1; ir->code = (ir->code << ir->shift_by) | 1;
rc5 = bttv_rc5_decode(ir->code); rc5 = bttv_rc5_decode(ir->code);
/* two start bits? */ /* two start bits? */
if (RC5_START(rc5) != ir->start) { if (RC5_START(rc5) != ir->start) {
printk(KERN_INFO DEVNAME ":" pr_info(DEVNAME ":"
" rc5 start bits invalid: %u\n", RC5_START(rc5)); " rc5 start bits invalid: %u\n", RC5_START(rc5));
/* right address? */ /* right address? */
...@@ -235,8 +237,7 @@ static void bttv_rc5_timer_end(unsigned long data) ...@@ -235,8 +237,7 @@ static void bttv_rc5_timer_end(unsigned long data)
/* Good code */ /* Good code */
rc_keydown(ir->dev, instr, toggle); rc_keydown(ir->dev, instr, toggle);
dprintk(KERN_INFO DEVNAME ":" dprintk("instruction %x, toggle %x\n",
" instruction %x, toggle %x\n",
instr, toggle); instr, toggle);
} }
} }
...@@ -265,7 +266,7 @@ static int bttv_rc5_irq(struct bttv *btv) ...@@ -265,7 +266,7 @@ static int bttv_rc5_irq(struct bttv *btv)
tv.tv_usec - ir->base_time.tv_usec; tv.tv_usec - ir->base_time.tv_usec;
} }
dprintk(KERN_INFO DEVNAME ": RC5 IRQ: gap %d us for %s\n", dprintk("RC5 IRQ: gap %d us for %s\n",
gap, (gpio & 0x20) ? "mark" : "space"); gap, (gpio & 0x20) ? "mark" : "space");
/* remote IRQ? */ /* remote IRQ? */
...@@ -340,14 +341,14 @@ static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) ...@@ -340,14 +341,14 @@ static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
/* poll IR chip */ /* poll IR chip */
if (1 != i2c_master_recv(ir->c, &b, 1)) { if (1 != i2c_master_recv(ir->c, &b, 1)) {
dprintk(KERN_INFO DEVNAME ": read error\n"); dprintk("read error\n");
return -EIO; return -EIO;
} }
/* ignore 0xaa */ /* ignore 0xaa */
if (b==0xaa) if (b==0xaa)
return 0; return 0;
dprintk(KERN_INFO DEVNAME ": key %02x\n", b); dprintk("key %02x\n", b);
/* /*
* NOTE: * NOTE:
...@@ -517,7 +518,7 @@ int bttv_input_init(struct bttv *btv) ...@@ -517,7 +518,7 @@ int bttv_input_init(struct bttv *btv)
break; break;
} }
if (NULL == ir_codes) { if (NULL == ir_codes) {
dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type); dprintk("Ooops: IR config error [card=%d]\n", btv->c.type);
err = -ENODEV; err = -ENODEV;
goto err_out_free; goto err_out_free;
} }
......
drivers/media/video/bt8xx/bttv-risc.c
View file @ 8af443e5
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -473,8 +475,7 @@ bttv_set_dma(struct bttv *btv, int override) ...@@ -473,8 +475,7 @@ bttv_set_dma(struct bttv *btv, int override)
capctl |= (btv->cap_ctl & 0x0c) ? 0x0c : 0x00; /* vbi data */ capctl |= (btv->cap_ctl & 0x0c) ? 0x0c : 0x00; /* vbi data */
capctl |= override; capctl |= override;
d2printk(KERN_DEBUG d2printk("%d: capctl=%x lirq=%d top=%08llx/%08llx even=%08llx/%08llx\n",
"bttv%d: capctl=%x lirq=%d top=%08Lx/%08Lx even=%08Lx/%08Lx\n",
btv->c.nr,capctl,btv->loop_irq, btv->c.nr,capctl,btv->loop_irq,
btv->cvbi ? (unsigned long long)btv->cvbi->top.dma : 0, btv->cvbi ? (unsigned long long)btv->cvbi->top.dma : 0,
btv->curr.top ? (unsigned long long)btv->curr.top->top.dma : 0, btv->curr.top ? (unsigned long long)btv->curr.top->top.dma : 0,
...@@ -517,8 +518,8 @@ bttv_risc_init_main(struct bttv *btv) ...@@ -517,8 +518,8 @@ bttv_risc_init_main(struct bttv *btv)
if ((rc = btcx_riscmem_alloc(btv->c.pci,&btv->main,PAGE_SIZE)) < 0) if ((rc = btcx_riscmem_alloc(btv->c.pci,&btv->main,PAGE_SIZE)) < 0)
return rc; return rc;
dprintk(KERN_DEBUG "bttv%d: risc main @ %08Lx\n", dprintk("%d: risc main @ %08llx\n",
btv->c.nr,(unsigned long long)btv->main.dma); btv->c.nr, (unsigned long long)btv->main.dma);
btv->main.cpu[0] = cpu_to_le32(BT848_RISC_SYNC | BT848_RISC_RESYNC | btv->main.cpu[0] = cpu_to_le32(BT848_RISC_SYNC | BT848_RISC_RESYNC |
BT848_FIFO_STATUS_VRE); BT848_FIFO_STATUS_VRE);
...@@ -557,12 +558,12 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc, ...@@ -557,12 +558,12 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc,
unsigned long next = btv->main.dma + ((slot+2) << 2); unsigned long next = btv->main.dma + ((slot+2) << 2);
if (NULL == risc) { if (NULL == risc) {
d2printk(KERN_DEBUG "bttv%d: risc=%p slot[%d]=NULL\n", d2printk("%d: risc=%p slot[%d]=NULL\n", btv->c.nr, risc, slot);
btv->c.nr,risc,slot);
btv->main.cpu[slot+1] = cpu_to_le32(next); btv->main.cpu[slot+1] = cpu_to_le32(next);
} else { } else {
d2printk(KERN_DEBUG "bttv%d: risc=%p slot[%d]=%08Lx irq=%d\n", d2printk("%d: risc=%p slot[%d]=%08llx irq=%d\n",
btv->c.nr,risc,slot,(unsigned long long)risc->dma,irqflags); btv->c.nr, risc, slot,
(unsigned long long)risc->dma, irqflags);
cmd = BT848_RISC_JUMP; cmd = BT848_RISC_JUMP;
if (irqflags) { if (irqflags) {
cmd |= BT848_RISC_IRQ; cmd |= BT848_RISC_IRQ;
...@@ -708,8 +709,7 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf) ...@@ -708,8 +709,7 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm; const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm;
struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
dprintk(KERN_DEBUG dprintk("%d: buffer field: %s format: %s size: %dx%d\n",
"bttv%d: buffer field: %s format: %s size: %dx%d\n",
btv->c.nr, v4l2_field_names[buf->vb.field], btv->c.nr, v4l2_field_names[buf->vb.field],
buf->fmt->name, buf->vb.width, buf->vb.height); buf->fmt->name, buf->vb.width, buf->vb.height);
...@@ -870,10 +870,9 @@ bttv_overlay_risc(struct bttv *btv, ...@@ -870,10 +870,9 @@ bttv_overlay_risc(struct bttv *btv,
struct bttv_buffer *buf) struct bttv_buffer *buf)
{ {
/* check interleave, bottom+top fields */ /* check interleave, bottom+top fields */
dprintk(KERN_DEBUG dprintk("%d: overlay fields: %s format: %s size: %dx%d\n",
"bttv%d: overlay fields: %s format: %s size: %dx%d\n",
btv->c.nr, v4l2_field_names[buf->vb.field], btv->c.nr, v4l2_field_names[buf->vb.field],
fmt->name,ov->w.width,ov->w.height); fmt->name, ov->w.width, ov->w.height);
/* calculate geometry */ /* calculate geometry */
bttv_calc_geo(btv,&buf->geo,ov->w.width,ov->w.height, bttv_calc_geo(btv,&buf->geo,ov->w.width,ov->w.height,
......
drivers/media/video/bt8xx/bttv-vbi.c
View file @ 8af443e5
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/fs.h> #include <linux/fs.h>
...@@ -65,8 +67,11 @@ MODULE_PARM_DESC(vbi_debug,"vbi code debug messages, default is 0 (no)"); ...@@ -65,8 +67,11 @@ MODULE_PARM_DESC(vbi_debug,"vbi code debug messages, default is 0 (no)");
#ifdef dprintk #ifdef dprintk
# undef dprintk # undef dprintk
#endif #endif
#define dprintk(fmt, arg...) if (vbi_debug) \ #define dprintk(fmt, ...) \
printk(KERN_DEBUG "bttv%d/vbi: " fmt, btv->c.nr , ## arg) do { \
if (vbi_debug) \
pr_debug("%d: " fmt, btv->c.nr, ##__VA_ARGS__); \
} while (0)
#define IMAGE_SIZE(fmt) \ #define IMAGE_SIZE(fmt) \
(((fmt)->count[0] + (fmt)->count[1]) * (fmt)->samples_per_line) (((fmt)->count[0] + (fmt)->count[1]) * (fmt)->samples_per_line)
......
drivers/media/video/bt8xx/bttvp.h
View file @ 8af443e5
...@@ -310,9 +310,21 @@ extern unsigned int bttv_gpio; ...@@ -310,9 +310,21 @@ extern unsigned int bttv_gpio;
extern void bttv_gpio_tracking(struct bttv *btv, char *comment); extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
extern int init_bttv_i2c(struct bttv *btv); extern int init_bttv_i2c(struct bttv *btv);
#define bttv_printk if (bttv_verbose) printk #define dprintk(fmt, ...) \
#define dprintk if (bttv_debug >= 1) printk do { \
#define d2printk if (bttv_debug >= 2) printk if (bttv_debug >= 1) \
pr_debug(fmt, ##__VA_ARGS__); \
} while (0)
#define dprintk_cont(fmt, ...) \
do { \
if (bttv_debug >= 1) \
pr_cont(fmt, ##__VA_ARGS__); \
} while (0)
#define d2printk(fmt, ...) \
do { \
if (bttv_debug >= 2) \
printk(fmt, ##__VA_ARGS__); \
} while (0)
#define BTTV_MAX_FBUF 0x208000 #define BTTV_MAX_FBUF 0x208000
#define BTTV_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ #define BTTV_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7