sh: add init member to pci_channel data

This patch adds an init callback to struct pci_channel and makes sure
it is initialized properly. Code is added to call this init function
from pcibios_init(). Return values are adjusted and a warning is is
printed if init fails.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 18 insertions, 5 deletions

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 0d6ac7a1db49..29ec16e69afa 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -28,18 +28,31 @@ static int __init pcibios_init(void)
         struct pci_bus *bus;
         int busno;
 
+        /* init channels */
+        busno = 0;
+        for (p = board_pci_channels; p->init; p++) {
+                if (p->init(p) == 0)
+                        p->enabled = 1;
+                else
+                        pr_err("Unable to init pci channel %d\n", busno);
+                busno++;
+        }
+
 #ifdef CONFIG_PCI_AUTO
         /* assign resources */
         busno = 0;
-        for (p = board_pci_channels; p->pci_ops != NULL; p++)
-                busno = pciauto_assign_resources(busno, p) + 1;
+        for (p = board_pci_channels; p->init; p++)
+                if (p->enabled)
+                        busno = pciauto_assign_resources(busno, p) + 1;
 #endif
 
         /* scan the buses */
         busno = 0;
-        for (p = board_pci_channels; p->pci_ops != NULL; p++) {
-                bus = pci_scan_bus(busno, p->pci_ops, p);
-                busno = bus->subordinate + 1;
+        for (p = board_pci_channels; p->init; p++) {
+                if (p->enabled) {
+                        bus = pci_scan_bus(busno, p->pci_ops, p);
+                        busno = bus->subordinate + 1;
+                }
         }
 
         pci_fixup_irqs(pci_common_swizzle, pcibios_map_platform_irq);