static int emac_wait_deps(struct emac_instance *dev)
@@ -2419,26 +2397,25 @@ static int emac_wait_deps(struct emac_instance *dev)
deps[EMAC_DEP_MDIO_IDX].phandle = dev->mdio_ph;
if (dev->blist && dev->blist > emac_boot_list)
deps[EMAC_DEP_PREV_IDX].phandle = 0xffffffffu;
- bus_register_notifier(&platform_bus_type, &emac_of_bus_notifier);
- wait_event_timeout(emac_probe_wait,
- emac_check_deps(dev, deps),
- EMAC_PROBE_DEP_TIMEOUT);
- bus_unregister_notifier(&platform_bus_type, &emac_of_bus_notifier);
- err = emac_check_deps(dev, deps) ? 0 : -ENODEV;
+
+ err = emac_check_deps(dev, deps);
+ if (err)
+ return err;
+
for (i = 0; i < EMAC_DEP_COUNT; i++) {
of_node_put(deps[i].node);
- if (err)
- platform_device_put(deps[i].ofdev);
- }
- if (err == 0) {
- dev->mal_dev = deps[EMAC_DEP_MAL_IDX].ofdev;
- dev->zmii_dev = deps[EMAC_DEP_ZMII_IDX].ofdev;
- dev->rgmii_dev = deps[EMAC_DEP_RGMII_IDX].ofdev;
- dev->tah_dev = deps[EMAC_DEP_TAH_IDX].ofdev;
- dev->mdio_dev = deps[EMAC_DEP_MDIO_IDX].ofdev;
+ platform_device_put(deps[i].ofdev);