ACPI / LPSS: Switch to use acpi_dev_hid_uid_match()
Since we have a generic helper, drop custom implementation in the driver. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Родитель
35009c8074
Коммит
7e70c8acf2
|
@ -478,31 +478,16 @@ static const struct lpss_device_links lpss_device_links[] = {
|
|||
{"80860F41", "5", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
|
||||
};
|
||||
|
||||
static bool hid_uid_match(struct acpi_device *adev,
|
||||
const char *hid2, const char *uid2)
|
||||
{
|
||||
const char *hid1 = acpi_device_hid(adev);
|
||||
const char *uid1 = acpi_device_uid(adev);
|
||||
|
||||
if (strcmp(hid1, hid2))
|
||||
return false;
|
||||
|
||||
if (!uid2)
|
||||
return true;
|
||||
|
||||
return uid1 && !strcmp(uid1, uid2);
|
||||
}
|
||||
|
||||
static bool acpi_lpss_is_supplier(struct acpi_device *adev,
|
||||
const struct lpss_device_links *link)
|
||||
{
|
||||
return hid_uid_match(adev, link->supplier_hid, link->supplier_uid);
|
||||
return acpi_dev_hid_uid_match(adev, link->supplier_hid, link->supplier_uid);
|
||||
}
|
||||
|
||||
static bool acpi_lpss_is_consumer(struct acpi_device *adev,
|
||||
const struct lpss_device_links *link)
|
||||
{
|
||||
return hid_uid_match(adev, link->consumer_hid, link->consumer_uid);
|
||||
return acpi_dev_hid_uid_match(adev, link->consumer_hid, link->consumer_uid);
|
||||
}
|
||||
|
||||
struct hid_uid {
|
||||
|
@ -518,7 +503,7 @@ static int match_hid_uid(struct device *dev, const void *data)
|
|||
if (!adev)
|
||||
return 0;
|
||||
|
||||
return hid_uid_match(adev, id->hid, id->uid);
|
||||
return acpi_dev_hid_uid_match(adev, id->hid, id->uid);
|
||||
}
|
||||
|
||||
static struct device *acpi_lpss_find_device(const char *hid, const char *uid)
|
||||
|
|
Загрузка…
Ссылка в новой задаче