On Tue, Sep 24, 2019 at 03:01:53PM +0300, Andy Shevchenko wrote:
> Since we have a generic helper, drop custom implementation in the driver.
Actually we may get rid of match_hid_uid() completely and thus slightly speed
up get_acpihid_device_id().
I'll wait for other comments and then send v2.
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> drivers/iommu/amd_iommu.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
> index 61de81965c44..bad1bcea4ea1 100644
> --- a/drivers/iommu/amd_iommu.c
> +++ b/drivers/iommu/amd_iommu.c
> @@ -129,24 +129,11 @@ 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));
> + return acpi_dev_hid_uid_match(adev, entry->hid, entry->uid) ? 0 : -ENODEV;
> }
>
> static inline u16 get_pci_device_id(struct device *dev)
> --
> 2.23.0
>
--
With Best Regards,
Andy Shevchenko
