2023-03-24 11:43:16

by Andy Shevchenko

Subject: [PATCH v1 1/1] ACPI: property: Refactor acpi_data_prop_read_single()

Refactor acpi_data_prop_read_single() for decreased indentation
and better structure. No functional changes intended.

Signed-off-by: Andy Shevchenko <[email protected]>
---
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 b8d9eb9a433e..413e4fcadcaf 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -971,60 +971,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;
- 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;

+ 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;
+
+ /* When no storage provided return number of available values */
+ return val ? 0 : 1;
}

#define acpi_copy_property_array_uint(items, val, nval) \
--
2.40.0.1.gaa8946217a0b

2023-03-27 09:54:53

by Sakari Ailus

Subject: Re: [PATCH v1 1/1] ACPI: property: Refactor acpi_data_prop_read_single()

Hi Andy,

Thanks for the patch.

On Fri, Mar 24, 2023 at 01:41:46PM +0200, Andy Shevchenko wrote:
> Refactor acpi_data_prop_read_single() for decreased indentation
> and better structure. No functional changes intended.
>
> Signed-off-by: Andy Shevchenko <[email protected]>

Reviewed-by: Sakari Ailus <[email protected]>

--
Sakari Ailus

2023-03-27 18:52:33

by Rafael J. Wysocki

Subject: Re: [PATCH v1 1/1] ACPI: property: Refactor acpi_data_prop_read_single()

On Mon, Mar 27, 2023 at 11:54 AM Sakari Ailus
<[email protected]> wrote:
>
> Hi Andy,
>
> Thanks for the patch.
>
> On Fri, Mar 24, 2023 at 01:41:46PM +0200, Andy Shevchenko wrote:
> > Refactor acpi_data_prop_read_single() for decreased indentation
> > and better structure. No functional changes intended.
> >
> > Signed-off-by: Andy Shevchenko <[email protected]>
>
> Reviewed-by: Sakari Ailus <[email protected]>

Applied as 6.4 material, thanks!