From: Rafael J. Wysocki <[email protected]>
Subject: [PATCH] drivers: net: Replace acpi_bus_get_device()
Replace acpi_bus_get_device() that is going to be dropped with
acpi_fetch_acpi_dev().
While at it, rearrange the local variable definitions in
bgx_acpi_register_phy() and mdio-xgene.c:acpi_register_phy() so as
to put them in the reverse xmas tree order.
No intentional functional impact.
Reviewed-by: Andrew Lunn <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
-> v2: Put local variable definitions in two functions the reverse xmas tree
order (Andrew Lunn).
---
drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 6 +++---
drivers/net/fjes/fjes_main.c | 10 +++-------
drivers/net/mdio/mdio-xgene.c | 10 ++++------
3 files changed, 10 insertions(+), 16 deletions(-)
Index: linux-pm/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
===================================================================
--- linux-pm.orig/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ linux-pm/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1405,11 +1405,11 @@ static int acpi_get_mac_address(struct d
static acpi_status bgx_acpi_register_phy(acpi_handle handle,
u32 lvl, void *context, void **rv)
{
- struct bgx *bgx = context;
+ struct acpi_device *adev = acpi_fetch_acpi_dev(handle);
struct device *dev = &bgx->pdev->dev;
- struct acpi_device *adev;
+ struct bgx *bgx = context;
- if (acpi_bus_get_device(handle, &adev))
+ if (!adev)
goto out;
acpi_get_mac_address(dev, adev, bgx->lmac[bgx->acpi_lmac_idx].mac);
Index: linux-pm/drivers/net/fjes/fjes_main.c
===================================================================
--- linux-pm.orig/drivers/net/fjes/fjes_main.c
+++ linux-pm/drivers/net/fjes/fjes_main.c
@@ -1512,15 +1512,11 @@ static acpi_status
acpi_find_extended_socket_device(acpi_handle obj_handle, u32 level,
void *context, void **return_value)
{
- struct acpi_device *device;
+ struct acpi_device *device = acpi_fetch_acpi_dev(obj_handle);
bool *found = context;
- int result;
- result = acpi_bus_get_device(obj_handle, &device);
- if (result)
- return AE_OK;
-
- if (strcmp(acpi_device_hid(device), ACPI_MOTHERBOARD_RESOURCE_HID))
+ if (!device ||
+ strcmp(acpi_device_hid(device), ACPI_MOTHERBOARD_RESOURCE_HID))
return AE_OK;
if (!is_extended_socket_device(device))
Index: linux-pm/drivers/net/mdio/mdio-xgene.c
===================================================================
--- linux-pm.orig/drivers/net/mdio/mdio-xgene.c
+++ linux-pm/drivers/net/mdio/mdio-xgene.c
@@ -279,16 +279,14 @@ EXPORT_SYMBOL(xgene_enet_phy_register);
static acpi_status acpi_register_phy(acpi_handle handle, u32 lvl,
void *context, void **ret)
{
+ struct acpi_device *adev = acpi_fetch_acpi_dev(handle);
struct mii_bus *mdio = context;
- struct acpi_device *adev;
- struct phy_device *phy_dev;
const union acpi_object *obj;
+ struct phy_device *phy_dev;
u32 phy_addr;
- if (acpi_bus_get_device(handle, &adev))
- return AE_OK;
-
- if (acpi_dev_get_property(adev, "phy-channel", ACPI_TYPE_INTEGER, &obj))
+ if (!adev ||
+ acpi_dev_get_property(adev, "phy-channel", ACPI_TYPE_INTEGER, &obj))
return AE_OK;
phy_addr = obj->integer.value;