[PATCH v1] efi/apple-properties: Device core takes care of empty properties

[PATCH v1] efi/apple-properties: Device core takes care of empty properties

[Andy Shevchenko]

There is no need to artificially supply a property length and fake data
if property has type of boolean.

Remove redundant piece of data and code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
 drivers/firmware/efi/apple-properties.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c
index 9f6bcf173b0e..b9602e0d7b50 100644
--- a/drivers/firmware/efi/apple-properties.c
+++ b/drivers/firmware/efi/apple-properties.c
@@ -52,8 +52,6 @@ struct properties_header {
 	struct dev_header dev_header[0];
 };
 
-static u8 one __initdata = 1;
-
 static void __init unmarshal_key_value_pairs(struct dev_header *dev_header,
 					     struct device *dev, void *ptr,
 					     struct property_entry entry[])
@@ -95,14 +93,9 @@ static void __init unmarshal_key_value_pairs(struct dev_header *dev_header,
 			     key_len - sizeof(key_len));
 
 		entry[i].name = key;
-		entry[i].is_array = true;
 		entry[i].length = val_len - sizeof(val_len);
+		entry[i].is_array = !!entry[i].length;
 		entry[i].pointer.raw_data = ptr + key_len + sizeof(val_len);
-		if (!entry[i].length) {
-			/* driver core doesn't accept empty properties */
-			entry[i].length = 1;
-			entry[i].pointer.raw_data = &one;
-		}
 
 		if (dump_properties) {
 			dev_info(dev, "property: %s\n", entry[i].name);
-- 
2.15.1

Re: [PATCH v1] efi/apple-properties: Device core takes care of empty properties

[Lukas Wunner]

On Mon, Jan 22, 2018 at 04:17:09PM +0200, Andy Shevchenko wrote:
> There is no need to artificially supply a property length and fake data
> if property has type of boolean.

You're right, I just didn't know better.

I've verified that with this patch applied, boolean properties are
still listed with the "dump_apple_properties" command line option
and I've also tested that it's still possible to test presence of
boolean properties with device_property_present(), so FWIW:

Reviewed-and-tested-by: Lukas Wunner <lukas-JFq808J9C/izQB+pC5nmwQ@public.gmane.org>

Thanks Andy!  Ard, could you pick this up please?

Kind regards,

Lukas

Re: [PATCH v1] efi/apple-properties: Device core takes care of empty properties

[Ard Biesheuvel]

On 22 January 2018 at 21:46, Lukas Wunner <lukas-JFq808J9C/izQB+pC5nmwQ@public.gmane.org> wrote:
> On Mon, Jan 22, 2018 at 04:17:09PM +0200, Andy Shevchenko wrote:
>> There is no need to artificially supply a property length and fake data
>> if property has type of boolean.
>
> You're right, I just didn't know better.
>
> I've verified that with this patch applied, boolean properties are
> still listed with the "dump_apple_properties" command line option
> and I've also tested that it's still possible to test presence of
> boolean properties with device_property_present(), so FWIW:
>
> Reviewed-and-tested-by: Lukas Wunner <lukas-JFq808J9C/izQB+pC5nmwQ@public.gmane.org>
>
> Thanks Andy!  Ard, could you pick this up please?
>

Applied, thanks.