Skip to content

Commit

Permalink
drivers: net: Replace acpi_bus_get_device()
Browse files Browse the repository at this point in the history
Replace acpi_bus_get_device() that is going to be dropped with
acpi_fetch_acpi_dev().

No intentional functional impact.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/11918902.O9o76ZdvQC@kreacher
Link: https://lore.kernel.org/r/11920660.O9o76ZdvQC@kreacher
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Rafael J. Wysocki authored and Jakub Kicinski committed Feb 2, 2022
1 parent 5903123 commit 52dae93
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion drivers/net/ethernet/cavium/thunder/thunder_bgx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,8 @@ static acpi_status bgx_acpi_register_phy(acpi_handle handle,
struct device *dev = &bgx->pdev->dev;
struct acpi_device *adev;

if (acpi_bus_get_device(handle, &adev))
adev = acpi_fetch_acpi_dev(handle);
if (!adev)
goto out;

acpi_get_mac_address(dev, adev, bgx->lmac[bgx->acpi_lmac_idx].mac);
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/fjes/fjes_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1514,10 +1514,9 @@ acpi_find_extended_socket_device(acpi_handle obj_handle, u32 level,
{
struct acpi_device *device;
bool *found = context;
int result;

result = acpi_bus_get_device(obj_handle, &device);
if (result)
device = acpi_fetch_acpi_dev(obj_handle);
if (!device)
return AE_OK;

if (strcmp(acpi_device_hid(device), ACPI_MOTHERBOARD_RESOURCE_HID))
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/mdio/mdio-xgene.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ static acpi_status acpi_register_phy(acpi_handle handle, u32 lvl,
const union acpi_object *obj;
u32 phy_addr;

if (acpi_bus_get_device(handle, &adev))
adev = acpi_fetch_acpi_dev(handle);
if (!adev)
return AE_OK;

if (acpi_dev_get_property(adev, "phy-channel", ACPI_TYPE_INTEGER, &obj))
Expand Down

0 comments on commit 52dae93

Please sign in to comment.