Merge branch 'master' into for-next

[linux-drm-fsl-dcu.git] / arch / alpha / kernel / pci_iommu.c

diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index cd634795aa9cda898c4f129b46e94e7d1475c785..3f844d26d2c71e072d28fb71a232e444daba281b 100644 (file)
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -236,7 +236,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask)
                ok = 0;
 
        /* If both conditions above are met, we are fine. */
-       DBGA("pci_dac_dma_supported %s from %p\n",
+       DBGA("pci_dac_dma_supported %s from %pf\n",
             ok ? "yes" : "no", __builtin_return_address(0));
 
        return ok;
@@ -268,7 +268,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,
            && paddr + size <= __direct_map_size) {
                ret = paddr + __direct_map_base;
 
-               DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %p\n",
+               DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %pf\n",
                      cpu_addr, size, ret, __builtin_return_address(0));
 
                return ret;
@@ -279,7 +279,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,
        if (dac_allowed) {
                ret = paddr + alpha_mv.pci_dac_offset;
 
-               DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %p\n",
+               DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %pf\n",
                      cpu_addr, size, ret, __builtin_return_address(0));
 
                return ret;
@@ -316,7 +316,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size,
        ret = arena->dma_base + dma_ofs * PAGE_SIZE;
        ret += (unsigned long)cpu_addr & ~PAGE_MASK;
 
-       DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %p\n",
+       DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %pf\n",
              cpu_addr, size, npages, ret, __builtin_return_address(0));
 
        return ret;
@@ -385,14 +385,14 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,
            && dma_addr < __direct_map_base + __direct_map_size) {
                /* Nothing to do.  */
 
-               DBGA2("pci_unmap_single: direct [%llx,%zx] from %p\n",
+               DBGA2("pci_unmap_single: direct [%llx,%zx] from %pf\n",
                      dma_addr, size, __builtin_return_address(0));
 
                return;
        }
 
        if (dma_addr > 0xffffffff) {
-               DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %p\n",
+               DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %pf\n",
                      dma_addr, size, __builtin_return_address(0));
                return;
        }
@@ -424,7 +424,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,
 
        spin_unlock_irqrestore(&arena->lock, flags);
 
-       DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %p\n",
+       DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %pf\n",
              dma_addr, size, npages, __builtin_return_address(0));
 }
 
@@ -447,7 +447,7 @@ try_again:
        cpu_addr = (void *)__get_free_pages(gfp, order);
        if (! cpu_addr) {
                printk(KERN_INFO "pci_alloc_consistent: "
-                      "get_free_pages failed from %p\n",
+                      "get_free_pages failed from %pf\n",
                        __builtin_return_address(0));
                /* ??? Really atomic allocation?  Otherwise we could play
                   with vmalloc and sg if we can't find contiguous memory.  */
@@ -466,7 +466,7 @@ try_again:
                goto try_again;
        }
 
-       DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %p\n",
+       DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %pf\n",
              size, cpu_addr, *dma_addrp, __builtin_return_address(0));
 
        return cpu_addr;
@@ -486,7 +486,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size,
        pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
        free_pages((unsigned long)cpu_addr, get_order(size));
 
-       DBGA2("pci_free_consistent: [%llx,%zx] from %p\n",
+       DBGA2("pci_free_consistent: [%llx,%zx] from %pf\n",
              dma_addr, size, __builtin_return_address(0));
 }