The ob_pci_initialize() function can be removed as it is empty, whilst ob_pci_empty_node is no longer required since the existing fallback code will always apply the ob_pci_simple_node bindings if no callback is configured.
Signed-off-by: Mark Cave-Ayland mark.cave-ayland@ilande.co.uk --- drivers/pci.c | 15 --------------- 1 file changed, 15 deletions(-)
diff --git a/drivers/pci.c b/drivers/pci.c index 623f649..d497109 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -54,7 +54,6 @@ DECLARE_UNNAMED_NODE( ob_pci_bus_node, INSTALL_OPEN, 2*sizeof(int) ); DECLARE_UNNAMED_NODE( ob_pci_bridge_node, INSTALL_OPEN, 2*sizeof(int) ); DECLARE_UNNAMED_NODE( ob_pci_simple_node, 0, 2*sizeof(int) ); -DECLARE_UNNAMED_NODE( ob_pci_empty_node, 0, 2*sizeof(int) );
const pci_arch_t *arch;
@@ -189,11 +188,6 @@ ob_pci_close(int *idx) { }
-static void -ob_pci_initialize(int *idx) -{ -} - /* ( str len -- phys.lo phys.mid phys.hi ) */
static void @@ -462,7 +456,6 @@ ob_pci_dma_sync(int *idx) }
NODE_METHODS(ob_pci_bus_node) = { - { NULL, ob_pci_initialize }, { "open", ob_pci_open }, { "close", ob_pci_close }, { "decode-unit", ob_pci_decode_unit }, @@ -485,7 +478,6 @@ ob_pci_bridge_map_in(int *idx) }
NODE_METHODS(ob_pci_bridge_node) = { - { NULL, ob_pci_initialize }, { "open", ob_pci_open }, { "close", ob_pci_close }, { "decode-unit", ob_pci_decode_unit }, @@ -503,10 +495,6 @@ NODE_METHODS(ob_pci_simple_node) = { { "close", ob_pci_close }, };
-NODE_METHODS(ob_pci_empty_node) = { - { NULL, ob_pci_initialize } -}; - static void pci_set_bus_range(const pci_config_t *config) { phandle_t dev = find_dev(config->path); @@ -1827,9 +1815,6 @@ static phandle_t ob_configure_pci_device(const char* parent_path, BIND_NODE_METHODS(phandle, ob_pci_bus_node); } break; - default: - BIND_NODE_METHODS(phandle, ob_pci_empty_node); - break; }
if (htype & PCI_HEADER_TYPE_BRIDGE) {