diff options
| author |   Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2015-09-30 08:52:45 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-05 03:23:22 -0700 |
| commit | 47f2e6c27553d9a164bb0067f4c1f9bbba388c2e (patch) | |
| tree | d9310dad5852aad9c37fefcc6e34b881f68a0fd3 /drivers | |
| parent | amd-xgbe: Remove an unneeded semicolon on a switch statement (diff) | |
| download | linux-dev-47f2e6c27553d9a164bb0067f4c1f9bbba388c2e.tar.xz linux-dev-47f2e6c27553d9a164bb0067f4c1f9bbba388c2e.zip | |
amd-xgbe: Use proper DT / ACPI precedence checking
Device tree presence takes precedence over ACPI in the device_* APIs.
The amd-xgbe driver should follow the same precedence. Update the check
on whether to use DT / ACPI to follow this.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c index e83bd76abce6..7dd893331785 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -371,7 +371,7 @@ static int xgbe_probe(struct platform_device *pdev) set_bit(XGBE_DOWN, &pdata->dev_state); /* Check if we should use ACPI or DT */ - pdata->use_acpi = (!pdata->adev || acpi_disabled) ? 0 : 1; + pdata->use_acpi = dev->of_node ? 0 : 1; phy_pdev = xgbe_get_phy_pdev(pdata); if (!phy_pdev) { |