From: Hanjun Guo <guohanjun@huawei.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: <linux-acpi@vger.kernel.org>, <linuxarm@huawei.com>,
Hanjun Guo <guohanjun@huawei.com>
Subject: [PATCH 1/3] ACPI: tables: Remove the duplicated checks for acpi_parse_entries_array()
Date: Tue, 21 Jul 2020 17:59:04 +0800 [thread overview]
Message-ID: <1595325546-63774-2-git-send-email-guohanjun@huawei.com> (raw)
In-Reply-To: <1595325546-63774-1-git-send-email-guohanjun@huawei.com>
acpi_disabled, pointer id and table_header are checked in
acpi_table_parse_entries_array(), and acpi_parse_entries_array() is only
called by acpi_table_parse_entries_array(), so those checks in
acpi_parse_entries_array() are duplicate.
Remove those duplicated check and move the table_size check to
function acpi_table_parse_entries_array() as well.
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
---
drivers/acpi/tables.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 0e905c3..c85e1c6 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -292,20 +292,6 @@ static int __init acpi_parse_entries_array(char *id, unsigned long table_size,
int errs = 0;
int i;
- if (acpi_disabled)
- return -ENODEV;
-
- if (!id)
- return -EINVAL;
-
- if (!table_size)
- return -EINVAL;
-
- if (!table_header) {
- pr_warn("%4.4s not present\n", id);
- return -ENODEV;
- }
-
table_end = (unsigned long)table_header + table_header->length;
/* Parse all entries looking for a match. */
@@ -371,6 +357,9 @@ int __init acpi_table_parse_entries_array(char *id,
if (!id)
return -EINVAL;
+ if (!table_size)
+ return -EINVAL;
+
if (!strncmp(id, ACPI_SIG_MADT, 4))
instance = acpi_apic_instance;
--
1.7.12.4
next prev parent reply other threads:[~2020-07-21 10:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 9:59 [PATCH 0/3] Minor cleanups Hanjun Guo
2020-07-21 9:59 ` Hanjun Guo [this message]
2020-07-21 9:59 ` [PATCH 2/3] ACPI: NUMA: Remove the useless sub table pointer check Hanjun Guo
2020-07-21 9:59 ` [PATCH 3/3] ACPI: NUMA: Remove the useless 'node >= MAX_NUMNODES' check Hanjun Guo
2020-07-27 13:20 ` [PATCH 0/3] Minor cleanups Rafael J. Wysocki
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=1595325546-63774-2-git-send-email-guohanjun@huawei.com \
--to=guohanjun@huawei.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linuxarm@huawei.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).