Commit 2be99912 authored by David S. Miller's avatar David S. Miller

[MEDIA]: Fix u64 printing in bttv driver.

parent 1d35d71d
...@@ -2948,16 +2948,16 @@ static void bttv_print_irqbits(u32 print, u32 mark) ...@@ -2948,16 +2948,16 @@ static void bttv_print_irqbits(u32 print, u32 mark)
static void bttv_print_riscaddr(struct bttv *btv) static void bttv_print_riscaddr(struct bttv *btv)
{ {
printk(" main: %08Lx\n", printk(" main: %08Lx\n",
(u64)btv->main.dma); (unsigned long long)btv->main.dma);
printk(" vbi : o=%08Lx e=%08Lx\n", printk(" vbi : o=%08Lx e=%08Lx\n",
btv->vcurr ? (u64)btv->vcurr->top.dma : 0, btv->vcurr ? (unsigned long long)btv->vcurr->top.dma : 0,
btv->vcurr ? (u64)btv->vcurr->bottom.dma : 0); btv->vcurr ? (unsigned long long)btv->vcurr->bottom.dma : 0);
printk(" cap : o=%08Lx e=%08Lx\n", printk(" cap : o=%08Lx e=%08Lx\n",
btv->top ? (u64)btv->top->top.dma : 0, btv->top ? (unsigned long long)btv->top->top.dma : 0,
btv->bottom ? (u64)btv->bottom->bottom.dma : 0); btv->bottom ? (unsigned long long)btv->bottom->bottom.dma : 0);
printk(" scr : o=%08Lx e=%08Lx\n", printk(" scr : o=%08Lx e=%08Lx\n",
btv->screen ? (u64)btv->screen->top.dma : 0, btv->screen ? (unsigned long long)btv->screen->top.dma : 0,
btv->screen ? (u64)btv->screen->bottom.dma : 0); btv->screen ? (unsigned long long)btv->screen->bottom.dma : 0);
} }
static void bttv_irq_timeout(unsigned long data) static void bttv_irq_timeout(unsigned long data)
......
...@@ -530,10 +530,10 @@ bttv_set_dma(struct bttv *btv, int override, int irqflags) ...@@ -530,10 +530,10 @@ bttv_set_dma(struct bttv *btv, int override, int irqflags)
d2printk(KERN_DEBUG d2printk(KERN_DEBUG
"bttv%d: capctl=%x irq=%d top=%08Lx/%08Lx even=%08Lx/%08Lx\n", "bttv%d: capctl=%x irq=%d top=%08Lx/%08Lx even=%08Lx/%08Lx\n",
btv->nr,capctl,irqflags, btv->nr,capctl,irqflags,
btv->vcurr ? (u64)btv->vcurr->top.dma : 0, btv->vcurr ? (unsigned long long)btv->vcurr->top.dma : 0,
btv->top ? (u64)btv->top->top.dma : 0, btv->top ? (unsigned long long)btv->top->top.dma : 0,
btv->vcurr ? (u64)btv->vcurr->bottom.dma : 0, btv->vcurr ? (unsigned long long)btv->vcurr->bottom.dma : 0,
btv->bottom ? (u64)btv->bottom->bottom.dma : 0); btv->bottom ? (unsigned long long)btv->bottom->bottom.dma : 0);
cmd = BT848_RISC_JUMP; cmd = BT848_RISC_JUMP;
if (irqflags) { if (irqflags) {
...@@ -568,7 +568,7 @@ bttv_risc_init_main(struct bttv *btv) ...@@ -568,7 +568,7 @@ bttv_risc_init_main(struct bttv *btv)
if ((rc = bttv_riscmem_alloc(btv->dev,&btv->main,PAGE_SIZE)) < 0) if ((rc = bttv_riscmem_alloc(btv->dev,&btv->main,PAGE_SIZE)) < 0)
return rc; return rc;
dprintk(KERN_DEBUG "bttv%d: risc main @ %08Lx\n", dprintk(KERN_DEBUG "bttv%d: risc main @ %08Lx\n",
btv->nr,(u64)btv->main.dma); btv->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);
...@@ -612,7 +612,7 @@ bttv_risc_hook(struct bttv *btv, int slot, struct bttv_riscmem *risc, ...@@ -612,7 +612,7 @@ bttv_risc_hook(struct bttv *btv, int slot, struct bttv_riscmem *risc,
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(KERN_DEBUG "bttv%d: risc=%p slot[%d]=%08Lx irq=%d\n",
btv->nr,risc,slot,(u64)risc->dma,irqflags); btv->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 | (irqflags << 16); cmd |= BT848_RISC_IRQ | (irqflags << 16);
......
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