efi/apple-properties: Remove redundant attribute initialization from unmarshal_key_va...

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.

Reviewed-and-tested-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180308080020.22828-3-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c
index 9f6bcf173b0ed8fdfc8b72f5e79dbb06ec2ef953..b9602e0d7b50e905d78a2b999f40f1c4bb7fc50d 100644 (file)
--- 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);