Skip to content

Commit

Permalink
i2c: mlxbf: Refactor _UID handling to use acpi_dev_uid_to_integer()
Browse files Browse the repository at this point in the history
ACPI utils provide acpi_dev_uid_to_integer() helper to extract _UID as
an integer. Use it instead of custom approach.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Wolfram Sang <wsa@kernel.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Andy Shevchenko authored and Rafael J. Wysocki committed Sep 19, 2022
1 parent f4c6752 commit 3ddaf13
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions drivers/i2c/busses/i2c-mlxbf.c
Original file line number Diff line number Diff line change
@@ -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;
priv->bus = bus_id;

return ret;
return 0;
}
#else
static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv)

0 comments on commit 3ddaf13

Please sign in to comment.