leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu/amd: Switch to use acpi_dev_hid_uid_match()

Browse Source 
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>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Andy Shevchenko 2019-10-01 17:27:25 +03:00 committed by Rafael J. Wysocki
parent 4f3cde3a24
commit ae5e6c6439
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/iommu/amd_iommu.c
View File

@ -124,30 +124,6 @@ static struct lock_class_key reserved_rbtree_key;
* *
****************************************************************************/ ****************************************************************************/
static inline int match_hid_uid(struct device *dev,
struct acpihid_map_entry *entry)
{
struct acpi_device *adev = ACPI_COMPANION(dev);
const char *hid, *uid;
if (!adev)
return -ENODEV;
hid = acpi_device_hid(adev);
uid = acpi_device_uid(adev);
if (!hid || !(*hid))
return -ENODEV;
if (!uid || !(*uid))
return strcmp(hid, entry->hid);
if (!(*entry->uid))
return strcmp(hid, entry->hid);
return (strcmp(hid, entry->hid) || strcmp(uid, entry->uid));
}
static inline u16 get_pci_device_id(struct device *dev) static inline u16 get_pci_device_id(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
@ -158,10 +134,14 @@ static inline u16 get_pci_device_id(struct device *dev)
static inline int get_acpihid_device_id(struct device *dev, static inline int get_acpihid_device_id(struct device *dev,
struct acpihid_map_entry **entry) struct acpihid_map_entry **entry)
{ {
struct acpi_device *adev = ACPI_COMPANION(dev);
struct acpihid_map_entry *p; struct acpihid_map_entry *p;
if (!adev)
return -ENODEV;
list_for_each_entry(p, &acpihid_map, list) { list_for_each_entry(p, &acpihid_map, list) {
if (!match_hid_uid(dev, p)) { if (acpi_dev_hid_uid_match(adev, p->hid, p->uid)) {
if (entry) if (entry)
*entry = p; *entry = p;
return p->devid; return p->devid;