ACPI: Convert ACPI reference args to generic fwnode reference args

[linux-2.6-block.git] / drivers / net / ethernet / apm / xgene / xgene_enet_hw.c

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 3188f553da35f7e4aeebcba2cdaffcc64ba6a3e1..078a04dc1182e9f6fe9d1316652307d7b9c5dc77 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -836,19 +836,19 @@ static void xgene_enet_adjust_link(struct net_device *ndev)
 #ifdef CONFIG_ACPI
 static struct acpi_device *acpi_phy_find_device(struct device *dev)
 {
-       struct acpi_reference_args args;
+       struct fwnode_reference_args args;
        struct fwnode_handle *fw_node;
        int status;
 
        fw_node = acpi_fwnode_handle(ACPI_COMPANION(dev));
        status = acpi_node_get_property_reference(fw_node, "phy-handle", 0,
                                                  &args);
-       if (ACPI_FAILURE(status)) {
+       if (ACPI_FAILURE(status) || !is_acpi_device_node(args.fwnode)) {
                dev_dbg(dev, "No matching phy in ACPI table\n");
                return NULL;
        }
 
-       return args.adev;
+       return to_acpi_device_node(args.fwnode);
 }
 #endif