[PATCH v1 2/2] platform/chrome: cros_typec_switch: simplify code with acpi_get_local_u64_address()

Andy Shevchenko posted 2 patches 2 weeks, 6 days ago
[PATCH v1 2/2] platform/chrome: cros_typec_switch: simplify code with acpi_get_local_u64_address()
Posted by Andy Shevchenko 2 weeks, 6 days ago
Now we have a helper so there's no need to open-code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/chrome/cros_typec_switch.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform/chrome/cros_typec_switch.c
index d8a28d4e51a8..fe0eddd2cf45 100644
--- a/drivers/platform/chrome/cros_typec_switch.c
+++ b/drivers/platform/chrome/cros_typec_switch.c
@@ -211,9 +211,8 @@ static int cros_typec_register_switches(struct cros_typec_switch_data *sdata)
 	struct cros_typec_port *port;
 	struct device *dev = sdata->dev;
 	struct fwnode_handle *fwnode;
-	struct acpi_device *adev;
-	unsigned long long index;
 	int nports, ret;
+	u64 index;
 
 	nports = device_get_child_node_count(dev);
 	if (nports == 0) {
@@ -228,17 +227,9 @@ static int cros_typec_register_switches(struct cros_typec_switch_data *sdata)
 			goto err_switch;
 		}
 
-		adev = to_acpi_device_node(fwnode);
-		if (!adev) {
-			dev_err(dev, "Couldn't get ACPI device handle for %pfwP\n", fwnode);
-			ret = -ENODEV;
-			goto err_switch;
-		}
-
-		ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
-		if (ACPI_FAILURE(ret)) {
+		ret = acpi_get_local_u64_address(ACPI_HANDLE_FWNODE(fwnode), &index);
+		if (ret) {
 			dev_err(dev, "_ADR wasn't evaluated for %pfwP\n", fwnode);
-			ret = -ENODATA;
 			goto err_switch;
 		}
 
-- 
2.50.1