diff options
Diffstat (limited to 'drivers/net/ehea/ehea_main.c')
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 519bb9f72d20..a1bd2d861d92 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -2609,7 +2609,7 @@ static int ehea_setup_ports(struct ehea_adapter *adapter) | |||
2609 | lhea_dn = adapter->ebus_dev->ofdev.node; | 2609 | lhea_dn = adapter->ebus_dev->ofdev.node; |
2610 | while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) { | 2610 | while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) { |
2611 | 2611 | ||
2612 | dn_log_port_id = get_property(eth_dn, "ibm,hea-port-no", | 2612 | dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no", |
2613 | NULL); | 2613 | NULL); |
2614 | if (!dn_log_port_id) { | 2614 | if (!dn_log_port_id) { |
2615 | ehea_error("bad device node: eth_dn name=%s", | 2615 | ehea_error("bad device node: eth_dn name=%s", |
@@ -2649,7 +2649,7 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter, | |||
2649 | lhea_dn = adapter->ebus_dev->ofdev.node; | 2649 | lhea_dn = adapter->ebus_dev->ofdev.node; |
2650 | while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) { | 2650 | while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) { |
2651 | 2651 | ||
2652 | dn_log_port_id = get_property(eth_dn, "ibm,hea-port-no", | 2652 | dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no", |
2653 | NULL); | 2653 | NULL); |
2654 | if (dn_log_port_id) | 2654 | if (dn_log_port_id) |
2655 | if (*dn_log_port_id == logical_port_id) | 2655 | if (*dn_log_port_id == logical_port_id) |
@@ -2790,7 +2790,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev, | |||
2790 | 2790 | ||
2791 | adapter->ebus_dev = dev; | 2791 | adapter->ebus_dev = dev; |
2792 | 2792 | ||
2793 | adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle", | 2793 | adapter_handle = of_get_property(dev->ofdev.node, "ibm,hea-handle", |
2794 | NULL); | 2794 | NULL); |
2795 | if (adapter_handle) | 2795 | if (adapter_handle) |
2796 | adapter->handle = *adapter_handle; | 2796 | adapter->handle = *adapter_handle; |