diff options
Diffstat (limited to 'arch/microblaze/pci/xilinx_pci.c')
-rw-r--r-- | arch/microblaze/pci/xilinx_pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/microblaze/pci/xilinx_pci.c b/arch/microblaze/pci/xilinx_pci.c index 0687a42a5bd4..14c7da5fd039 100644 --- a/arch/microblaze/pci/xilinx_pci.c +++ b/arch/microblaze/pci/xilinx_pci.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/of.h> | 18 | #include <linux/of.h> |
19 | #include <linux/of_address.h> | 19 | #include <linux/of_address.h> |
20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
21 | #include <asm/io.h> | 21 | #include <linux/io.h> |
22 | 22 | ||
23 | #define XPLB_PCI_ADDR 0x10c | 23 | #define XPLB_PCI_ADDR 0x10c |
24 | #define XPLB_PCI_DATA 0x110 | 24 | #define XPLB_PCI_DATA 0x110 |
@@ -82,7 +82,7 @@ xilinx_pci_exclude_device(struct pci_controller *hose, u_char bus, u8 devfn) | |||
82 | * | 82 | * |
83 | * List pci devices in very early phase. | 83 | * List pci devices in very early phase. |
84 | */ | 84 | */ |
85 | void __init xilinx_early_pci_scan(struct pci_controller *hose) | 85 | static void __init xilinx_early_pci_scan(struct pci_controller *hose) |
86 | { | 86 | { |
87 | u32 bus = 0; | 87 | u32 bus = 0; |
88 | u32 val, dev, func, offset; | 88 | u32 val, dev, func, offset; |
@@ -91,27 +91,27 @@ void __init xilinx_early_pci_scan(struct pci_controller *hose) | |||
91 | for (dev = 0; dev < 2; dev++) { | 91 | for (dev = 0; dev < 2; dev++) { |
92 | /* List only first function number - up-to 8 functions */ | 92 | /* List only first function number - up-to 8 functions */ |
93 | for (func = 0; func < 1; func++) { | 93 | for (func = 0; func < 1; func++) { |
94 | printk(KERN_INFO "%02x:%02x:%02x", bus, dev, func); | 94 | pr_info("%02x:%02x:%02x", bus, dev, func); |
95 | /* read the first 64 standardized bytes */ | 95 | /* read the first 64 standardized bytes */ |
96 | /* Up-to 192 bytes can be list of capabilities */ | 96 | /* Up-to 192 bytes can be list of capabilities */ |
97 | for (offset = 0; offset < 64; offset += 4) { | 97 | for (offset = 0; offset < 64; offset += 4) { |
98 | early_read_config_dword(hose, bus, | 98 | early_read_config_dword(hose, bus, |
99 | PCI_DEVFN(dev, func), offset, &val); | 99 | PCI_DEVFN(dev, func), offset, &val); |
100 | if (offset == 0 && val == 0xFFFFFFFF) { | 100 | if (offset == 0 && val == 0xFFFFFFFF) { |
101 | printk(KERN_CONT "\nABSENT"); | 101 | pr_cont("\nABSENT"); |
102 | break; | 102 | break; |
103 | } | 103 | } |
104 | if (!(offset % 0x10)) | 104 | if (!(offset % 0x10)) |
105 | printk(KERN_CONT "\n%04x: ", offset); | 105 | pr_cont("\n%04x: ", offset); |
106 | 106 | ||
107 | printk(KERN_CONT "%08x ", val); | 107 | pr_cont("%08x ", val); |
108 | } | 108 | } |
109 | printk(KERN_INFO "\n"); | 109 | pr_info("\n"); |
110 | } | 110 | } |
111 | } | 111 | } |
112 | } | 112 | } |
113 | #else | 113 | #else |
114 | void __init xilinx_early_pci_scan(struct pci_controller *hose) | 114 | static void __init xilinx_early_pci_scan(struct pci_controller *hose) |
115 | { | 115 | { |
116 | } | 116 | } |
117 | #endif | 117 | #endif |