Commit 02050558 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI: scan: Utilize match_string() API 



We have already an API to match a string in the array of strings.
Utilize it instead of open coded analogues.

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c830dbcf

drivers/acpi/scan.c

+10 −12
Original line number Diff line number Diff line
@@ -757,28 +757,26 @@ static bool acpi_info_matches_ids(struct acpi_device_info *info, 
				  const char * const ids[])

{

	struct acpi_pnp_device_id_list *cid_list = NULL;

	int i;

	int i, index;



	if (!(info->valid & ACPI_VALID_HID))

		return false;



	index = match_string(ids, -1, info->hardware_id.string);

	if (index >= 0)

		return true;



	if (info->valid & ACPI_VALID_CID)

		cid_list = &info->compatible_id_list;



	for (i = 0; ids[i]; i++) {

		int j;



		if (!strcmp(info->hardware_id.string, ids[i]))

			return true;



	if (!cid_list)

			continue;

		return false;



		for (j = 0; j < cid_list->count; j++) {

			if (!strcmp(cid_list->ids[j].string, ids[i]))

	for (i = 0; i < cid_list->count; i++) {

		index = match_string(ids, -1, cid_list->ids[i].string);

		if (index >= 0)

			return true;

	}

	}



	return false;

}