Commit a4065662 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Tzung-Bi Shih
Browse files

platform/chrome: cros_typec_switch: Use acpi_get_local_u64_address()

parent e1adf488
Loading
Loading
Loading
Loading
+3 −12
Original line number Diff line number Diff line
@@ -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;
		}