Commit 3ddaf139 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

i2c: mlxbf: Refactor _UID handling to use acpi_dev_uid_to_integer() 



ACPI utils provide acpi_dev_uid_to_integer() helper to extract _UID as
an integer. Use it instead of custom approach.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarWolfram Sang <wsa@kernel.org>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f4c6752d

drivers/i2c/busses/i2c-mlxbf.c

+6 −14
Original line number Diff line number Diff line
@@ -2229,35 +2229,27 @@ MODULE_DEVICE_TABLE(acpi, mlxbf_i2c_acpi_ids); 
static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv)

{

	const struct acpi_device_id *aid;

	struct acpi_device *adev;

	unsigned long bus_id = 0;

	const char *uid;

	u64 bus_id;

	int ret;



	if (acpi_disabled)

		return -ENOENT;



	adev = ACPI_COMPANION(dev);

	if (!adev)

		return -ENXIO;



	aid = acpi_match_device(mlxbf_i2c_acpi_ids, dev);

	if (!aid)

		return -ENODEV;



	priv->chip = (struct mlxbf_i2c_chip_info *)aid->driver_data;



	uid = acpi_device_uid(adev);

	if (!uid || !(*uid)) {

	ret = acpi_dev_uid_to_integer(ACPI_COMPANION(dev), &bus_id);

	if (ret) {

		dev_err(dev, "Cannot retrieve UID\n");

		return -ENODEV;

		return ret;

	}



	ret = kstrtoul(uid, 0, &bus_id);

	if (!ret)

	priv->bus = bus_id;



	return ret;

	return 0;

}

#else

static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv)