| @@ -739,6 +739,7 @@ EXPORT_SYMBOL(acpi_dev_found); · 738 unmodified lines |
| 739 | | 739 | |
| 740 | struct acpi_dev_match_info { | 740 | struct acpi_dev_match_info { |
| 741 | const char *dev_name; | 741 | const char *dev_name; |
| | 742 | struct acpi_device *adev; |
| 742 | struct acpi_device_id hid[2]; | 743 | struct acpi_device_id hid[2]; |
| 743 | const char *uid; | 744 | const char *uid; |
| 744 | s64 hrv; | 745 | s64 hrv; |
| @@ -759,6 +760,7 @@ static int acpi_dev_match_cb(struct device *dev, void *data) · 14 unmodified lines |
| 759 | return 0; | 760 | return 0; |
| 760 | | 761 | |
| 761 | match->dev_name = acpi_dev_name(adev); | 762 | match->dev_name = acpi_dev_name(adev); |
| | 763 | match->adev = adev; |
| 762 | | 764 | |
| 763 | if (match->hrv == -1) | 765 | if (match->hrv == -1) |
| 764 | return 1; | 766 | return 1; |
| @@ -806,16 +808,34 @@ bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) · 41 unmodified lines |
| 806 | EXPORT_SYMBOL(acpi_dev_present); | 808 | EXPORT_SYMBOL(acpi_dev_present); |
| 807 | | 809 | |
| 808 | /** | 810 | /** |
| 809 | * acpi_dev_get_first_match_name - Return name of first match of ACPI device | 811 | * acpi_dev_get_first_match_dev - Return the first match of ACPI device |
| 810 | * @hid: Hardware ID of the device. | 812 | * @hid: Hardware ID of the device. |
| 811 | * @uid: Unique ID of the device, pass NULL to not check _UID | 813 | * @uid: Unique ID of the device, pass NULL to not check _UID |
| 812 | * @hrv: Hardware Revision of the device, pass -1 to not check _HRV | 814 | * @hrv: Hardware Revision of the device, pass -1 to not check _HRV |
| 813 | * | 815 | * |
| 814 | * Return device name if a matching device was present | 816 | * Return the first match of ACPI device if a matching device was present |
| 815 | * at the moment of invocation, or NULL otherwise. | 817 | * at the moment of invocation, or NULL otherwise. |
| 816 | * | 818 | * |
| | 819 | * The caller is responsible to call put_device() on the returned device. |
| | 820 | * |
| 817 | * See additional information in acpi_dev_present() as well. | 821 | * See additional information in acpi_dev_present() as well. |
| 818 | */ | 822 | */ |
| | 823 | struct acpi_device * |
| | 824 | acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv) |
| | 825 | { |
| | 826 | struct acpi_dev_match_info match = {}; |
| | 827 | struct device *dev; |
| | 828 | |
| | 829 | strlcpy(match.hid[0].id, hid, sizeof(match.hid[0].id)); |
| | 830 | match.uid = uid; |
| | 831 | match.hrv = hrv; |
| | 832 | |
| | 833 | dev = bus_find_device(&acpi_bus_type, NULL, &match, acpi_dev_match_cb); |
| | 834 | return dev ? match.adev : NULL; |
| | 835 | } |
| | 836 | EXPORT_SYMBOL(acpi_dev_get_first_match_dev); |
| | 837 | |
| | 838 | /* DEPRECATED, use acpi_dev_get_first_match_dev() instead */ |
| 819 | const char * | 839 | const char * |
| 820 | acpi_dev_get_first_match_name(const char *hid, const char *uid, s64 hrv) | 840 | acpi_dev_get_first_match_name(const char *hid, const char *uid, s64 hrv) |
| 821 | { | 841 | { |