Commit 47f2e6c2 authored Sep 30, 2015 by Lendacky, Thomas Committed by David S. Miller Oct 05, 2015

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>

parent 3947d78a

drivers/net/ethernet/amd/xgbe/xgbe-main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message