From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>
Subject: Re: [PATCH v1 1/1] ACPI: scan: Utilize match_string() API
Date: Mon, 12 Apr 2021 19:35:09 +0200 [thread overview]
Message-ID: <CAJZ5v0gFiLgEeBCuhn1cKMA=G-+_Z+VLDa0OnagU+d4Vgn-Gmw@mail.gmail.com> (raw)
In-Reply-To: <20210410140253.1966892-1-andy.shevchenko@gmail.com>
On Sat, Apr 10, 2021 at 4:02 PM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
>
> We have already an API to match a string in the array of strings.
> Utilize it instead of open coded analogues.
>
> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> ---
> drivers/acpi/scan.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index b1d1f1a8ce69..bba6b529cf6c 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -756,27 +756,25 @@ 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 (!cid_list)
> + return false;
>
> - if (!strcmp(info->hardware_id.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;
> -
> - if (!cid_list)
> - continue;
> -
> - for (j = 0; j < cid_list->count; j++) {
> - if (!strcmp(cid_list->ids[j].string, ids[i]))
> - return true;
> - }
> }
>
> return false;
> --
Applied as 5.13 material, thanks!
prev parent reply other threads:[~2021-04-12 17:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-10 14:02 [PATCH v1 1/1] ACPI: scan: Utilize match_string() API Andy Shevchenko
2021-04-12 17:35 ` Rafael J. Wysocki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJZ5v0gFiLgEeBCuhn1cKMA=G-+_Z+VLDa0OnagU+d4Vgn-Gmw@mail.gmail.com' \
--to=rafael@kernel.org \
--cc=andy.shevchenko@gmail.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).