[PATCH] ACPI / tables: Return error from table parse handler

[PATCH] ACPI / tables: Return error from table parse handler

[Matthias Brugger]

The handler called in acpi_table_parse may return an error.
This patch returns this error instead of ignoring it.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
 drivers/acpi/tables.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a372f9e..fb5cd80 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -394,6 +394,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
 {
 	struct acpi_table_header *table = NULL;
 	acpi_size tbl_size;
+	int ret;
 
 	if (acpi_disabled)
 		return -ENODEV;
@@ -407,9 +408,9 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
 		acpi_get_table_with_size(id, 0, &table, &tbl_size);
 
 	if (table) {
-		handler(table);
+		ret = handler(table);
 		early_acpi_os_unmap_memory(table, tbl_size);
-		return 0;
+		return ret;
 	} else
 		return -ENODEV;
 }
-- 
2.6.6

Re: [PATCH] ACPI / tables: Return error from table parse handler

[Rafael J. Wysocki]

On Thu, May 19, 2016 at 6:51 PM, Matthias Brugger <mbrugger@suse.com> wrote:
> The handler called in acpi_table_parse may return an error.
> This patch returns this error instead of ignoring it.

And does it address any particular practical problem or is it just a
code cleanup?

> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
> ---
>  drivers/acpi/tables.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
> index a372f9e..fb5cd80 100644
> --- a/drivers/acpi/tables.c
> +++ b/drivers/acpi/tables.c
> @@ -394,6 +394,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
>  {
>         struct acpi_table_header *table = NULL;
>         acpi_size tbl_size;
> +       int ret;
>
>         if (acpi_disabled)
>                 return -ENODEV;
> @@ -407,9 +408,9 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
>                 acpi_get_table_with_size(id, 0, &table, &tbl_size);
>
>         if (table) {
> -               handler(table);
> +               ret = handler(table);
>                 early_acpi_os_unmap_memory(table, tbl_size);
> -               return 0;
> +               return ret;
>         } else
>                 return -ENODEV;
>  }
> --

Re: [PATCH] ACPI / tables: Return error from table parse handler

[Matthias Brugger]

On 19/05/16 23:17, Rafael J. Wysocki wrote:
> On Thu, May 19, 2016 at 6:51 PM, Matthias Brugger <mbrugger@suse.com> wrote:
>> The handler called in acpi_table_parse may return an error.
>> This patch returns this error instead of ignoring it.
>
> And does it address any particular practical problem or is it just a
> code cleanup?
>

It's just a code cleanup.

>> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
>> ---
>>   drivers/acpi/tables.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
>> index a372f9e..fb5cd80 100644
>> --- a/drivers/acpi/tables.c
>> +++ b/drivers/acpi/tables.c
>> @@ -394,6 +394,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
>>   {
>>          struct acpi_table_header *table = NULL;
>>          acpi_size tbl_size;
>> +       int ret;
>>
>>          if (acpi_disabled)
>>                  return -ENODEV;
>> @@ -407,9 +408,9 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
>>                  acpi_get_table_with_size(id, 0, &table, &tbl_size);
>>
>>          if (table) {
>> -               handler(table);
>> +               ret = handler(table);
>>                  early_acpi_os_unmap_memory(table, tbl_size);
>> -               return 0;
>> +               return ret;
>>          } else
>>                  return -ENODEV;
>>   }
>> --
>