From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: 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 v2 5/5] ACPI: property: Refactor acpi_data_prop_read_single()
Date: Fri, 12 Feb 2021 15:31:24 +0100 [thread overview]
Message-ID: <CAJZ5v0jot6w2AdTCmxn4Hw2zOzJk2JSrTaeH9cQR4or2N9HjCg@mail.gmail.com> (raw)
In-Reply-To: <20210212141121.62115-5-andriy.shevchenko@linux.intel.com>
On Fri, Feb 12, 2021 at 3:14 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> Refactor acpi_data_prop_read_single() for less LOCs and better maintenance.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/acpi/property.c | 80 ++++++++++++++++++-----------------------
> 1 file changed, 34 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
> index e312ebaed8db..494cf283a573 100644
> --- a/drivers/acpi/property.c
> +++ b/drivers/acpi/property.c
> @@ -785,60 +785,48 @@ static int acpi_data_prop_read_single(const struct acpi_device_data *data,
> enum dev_prop_type proptype, void *val)
> {
> const union acpi_object *obj;
> - int ret;
> + int ret = 0;
>
> - if (proptype >= DEV_PROP_U8 && proptype <= DEV_PROP_U64) {
> + if (proptype >= DEV_PROP_U8 && proptype <= DEV_PROP_U64)
> ret = acpi_data_get_property(data, propname, ACPI_TYPE_INTEGER, &obj);
> - if (ret)
> - return ret;
> -
> - switch (proptype) {
> - case DEV_PROP_U8:
> - if (obj->integer.value > U8_MAX)
> - return -EOVERFLOW;
> -
> - if (val)
> - *(u8 *)val = obj->integer.value;
> -
> - break;
The empty lines of code above are intentional, so please retain them.
> - case DEV_PROP_U16:
> - if (obj->integer.value > U16_MAX)
> - return -EOVERFLOW;
> -
> - if (val)
> - *(u16 *)val = obj->integer.value;
> -
> - break;
> - case DEV_PROP_U32:
> - if (obj->integer.value > U32_MAX)
> - return -EOVERFLOW;
> -
> - if (val)
> - *(u32 *)val = obj->integer.value;
> -
> - break;
> - default:
> - if (val)
> - *(u64 *)val = obj->integer.value;
> -
> - break;
> - }
> -
> - if (!val)
> - return 1;
> - } else if (proptype == DEV_PROP_STRING) {
> + else if (proptype == DEV_PROP_STRING)
> ret = acpi_data_get_property(data, propname, ACPI_TYPE_STRING, &obj);
> - if (ret)
> - return ret;
> + if (ret)
> + return ret;
else if (!val)
ret = 1;
>
> + switch (proptype) {
> + case DEV_PROP_U8:
> + if (obj->integer.value > U8_MAX)
> + return -EOVERFLOW;
> + if (val)
> + *(u8 *)val = obj->integer.value;
> + break;
> + case DEV_PROP_U16:
> + if (obj->integer.value > U16_MAX)
> + return -EOVERFLOW;
> + if (val)
> + *(u16 *)val = obj->integer.value;
> + break;
> + case DEV_PROP_U32:
> + if (obj->integer.value > U32_MAX)
> + return -EOVERFLOW;
> + if (val)
> + *(u32 *)val = obj->integer.value;
> + break;
> + case DEV_PROP_U64:
> + if (val)
> + *(u64 *)val = obj->integer.value;
> + break;
> + case DEV_PROP_STRING:
> if (val)
> *(char **)val = obj->string.pointer;
> -
> return 1;
> - } else {
> - ret = -EINVAL;
> + default:
> + return -EINVAL;
> }
> - return ret;
Retain this.
> +
> + /* When no storage provided return number of available values */
> + return val ? 0 : 1;
And this is just not looking good to me, sorry.
> }
>
> static int acpi_copy_property_array_u8(const union acpi_object *items, u8 *val,
> --
next prev parent reply other threads:[~2021-02-12 14:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-12 14:11 [PATCH v2 1/5] ACPI: property: Remove dead code Andy Shevchenko
2021-02-12 14:11 ` [PATCH v2 2/5] ACPI: property: Make acpi_node_prop_read() static Andy Shevchenko
2021-02-12 14:11 ` [PATCH v2 3/5] ACPI: property: Satisfy kernel doc validator (part 1) Andy Shevchenko
2021-02-12 14:11 ` [PATCH v2 4/5] ACPI: property: Satisfy kernel doc validator (part 2) Andy Shevchenko
2021-02-12 14:11 ` [PATCH v2 5/5] ACPI: property: Refactor acpi_data_prop_read_single() Andy Shevchenko
2021-02-12 14:31 ` Rafael J. Wysocki [this message]
2021-02-12 16:00 ` Andy Shevchenko
2021-02-12 16:07 ` Rafael J. Wysocki
2021-02-12 16:24 ` Andy Shevchenko
2021-02-12 14:36 ` [PATCH v2 1/5] ACPI: property: Remove dead code 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=CAJZ5v0jot6w2AdTCmxn4Hw2zOzJk2JSrTaeH9cQR4or2N9HjCg@mail.gmail.com \
--to=rafael@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).