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

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
...@@ -2229,35 +2229,27 @@ MODULE_DEVICE_TABLE(acpi, mlxbf_i2c_acpi_ids); ...@@ -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) static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv)
{ {
const struct acpi_device_id *aid; const struct acpi_device_id *aid;
struct acpi_device *adev; u64 bus_id;
unsigned long bus_id = 0;
const char *uid;
int ret; int ret;
if (acpi_disabled) if (acpi_disabled)
return -ENOENT; return -ENOENT;
adev = ACPI_COMPANION(dev);
if (!adev)
return -ENXIO;
aid = acpi_match_device(mlxbf_i2c_acpi_ids, dev); aid = acpi_match_device(mlxbf_i2c_acpi_ids, dev);
if (!aid) if (!aid)
return -ENODEV; return -ENODEV;
priv->chip = (struct mlxbf_i2c_chip_info *)aid->driver_data; priv->chip = (struct mlxbf_i2c_chip_info *)aid->driver_data;
uid = acpi_device_uid(adev); ret = acpi_dev_uid_to_integer(ACPI_COMPANION(dev), &bus_id);
if (!uid || !(*uid)) { if (ret) {
dev_err(dev, "Cannot retrieve UID\n"); dev_err(dev, "Cannot retrieve UID\n");
return -ENODEV; return ret;
} }
ret = kstrtoul(uid, 0, &bus_id); priv->bus = bus_id;
if (!ret)
priv->bus = bus_id;
return ret; return 0;
} }
#else #else
static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv) static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment