Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / sandbox / lib / pci_io.c

diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c
index 0de124f315f3486967dacebab2e94198123c161d..2038141947ab7b7adbb7ac0cc898b3f1b6521c4a 100644 (file)
--- a/arch/sandbox/lib/pci_io.c
+++ b/arch/sandbox/lib/pci_io.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 /*
@@ -12,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <log.h>
 #include <asm/io.h>
 
 int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
@@ -35,7 +35,7 @@ int pci_map_physmem(phys_addr_t paddr, unsigned long *lenp,
                return 0;
        }
 
-       debug("%s: failed: addr=%x\n", __func__, paddr);
+       debug("%s: failed: addr=%pap\n", __func__, &paddr);
        return -ENOSYS;
 }
 
@@ -92,7 +92,7 @@ static int pci_io_write(unsigned int addr, ulong value, pci_size_t size)
        return -ENOSYS;
 }
 
-int inl(unsigned int addr)
+int _inl(unsigned int addr)
 {
        unsigned long value;
        int ret;
@@ -102,7 +102,7 @@ int inl(unsigned int addr)
        return ret ? 0 : value;
 }
 
-int inw(unsigned int addr)
+int _inw(unsigned int addr)
 {
        unsigned long value;
        int ret;
@@ -112,7 +112,7 @@ int inw(unsigned int addr)
        return ret ? 0 : value;
 }
 
-int inb(unsigned int addr)
+int _inb(unsigned int addr)
 {
        unsigned long value;
        int ret;
@@ -122,17 +122,17 @@ int inb(unsigned int addr)
        return ret ? 0 : value;
 }
 
-void outl(unsigned int value, unsigned int addr)
+void _outl(unsigned int value, unsigned int addr)
 {
        pci_io_write(addr, value, PCI_SIZE_32);
 }
 
-void outw(unsigned int value, unsigned int addr)
+void _outw(unsigned int value, unsigned int addr)
 {
        pci_io_write(addr, value, PCI_SIZE_16);
 }
 
-void outb(unsigned int value, unsigned int addr)
+void _outb(unsigned int value, unsigned int addr)
 {
        pci_io_write(addr, value, PCI_SIZE_8);
 }