x86/smpboot: Init apic mapping before usage

[cascardo/linux.git] / drivers / dma / sa11x0-dma.c

diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c
index 43db255..1adeb32 100644 (file)
--- a/drivers/dma/sa11x0-dma.c
+++ b/drivers/dma/sa11x0-dma.c
@@ -463,7 +463,7 @@ static enum dma_status sa11x0_dma_tx_status(struct dma_chan *chan,
                        dma_addr_t addr = sa11x0_dma_pos(p);
                        unsigned i;
 
-                       dev_vdbg(d->slave.dev, "tx_status: addr:%x\n", addr);
+                       dev_vdbg(d->slave.dev, "tx_status: addr:%pad\n", &addr);
 
                        for (i = 0; i < txd->sglen; i++) {
                                dev_vdbg(d->slave.dev, "tx_status: [%u] %x+%x\n",
@@ -491,7 +491,7 @@ static enum dma_status sa11x0_dma_tx_status(struct dma_chan *chan,
        }
        spin_unlock_irqrestore(&c->vc.lock, flags);
 
-       dev_vdbg(d->slave.dev, "tx_status: bytes 0x%zx\n", state->residue);
+       dev_vdbg(d->slave.dev, "tx_status: bytes 0x%x\n", state->residue);
 
        return ret;
 }
@@ -551,8 +551,8 @@ static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg(
                if (len > DMA_MAX_SIZE)
                        j += DIV_ROUND_UP(len, DMA_MAX_SIZE & ~DMA_ALIGN) - 1;
                if (addr & DMA_ALIGN) {
-                       dev_dbg(chan->device->dev, "vchan %p: bad buffer alignment: %08x\n",
-                               &c->vc, addr);
+                       dev_dbg(chan->device->dev, "vchan %p: bad buffer alignment: %pad\n",
+                               &c->vc, &addr);
                        return NULL;
                }
        }
@@ -599,7 +599,7 @@ static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg(
        txd->size = size;
        txd->sglen = j;
 
-       dev_dbg(chan->device->dev, "vchan %p: txd %p: size %u nr %u\n",
+       dev_dbg(chan->device->dev, "vchan %p: txd %p: size %zu nr %u\n",
                &c->vc, &txd->vd, txd->size, txd->sglen);
 
        return vchan_tx_prep(&c->vc, &txd->vd, flags);
@@ -693,8 +693,8 @@ static int sa11x0_dma_device_config(struct dma_chan *chan,
        if (maxburst == 8)
                ddar |= DDAR_BS;
 
-       dev_dbg(c->vc.chan.device->dev, "vchan %p: dma_slave_config addr %x width %u burst %u\n",
-               &c->vc, addr, width, maxburst);
+       dev_dbg(c->vc.chan.device->dev, "vchan %p: dma_slave_config addr %pad width %u burst %u\n",
+               &c->vc, &addr, width, maxburst);
 
        c->ddar = ddar | (addr & 0xf0000000) | (addr & 0x003ffffc) << 6;