]> xenbits.xensource.com Git - people/aperard/xen-unstable.git/commitdiff
x86/shutdown: use DMI_MATCH2()
authorJan Beulich <jbeulich@suse.com>
Tue, 6 Aug 2024 06:37:10 +0000 (08:37 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 6 Aug 2024 06:37:10 +0000 (08:37 +0200)
... to please Misra C:2012 Rule 9.3 (Arrays shall not be partially
initialized).

Fixes: d81dd3130351 ("x86/shutdown: change default reboot method preference")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
xen/arch/x86/shutdown.c

index fa60d1638d58503c28af448964f04474a1249ee1..902076cf67261d4f63a163eba2ee39b79684bda6 100644 (file)
@@ -498,10 +498,9 @@ static const struct dmi_system_id __initconstrel reboot_dmi_table[] = {
         .callback = override_reboot,
         .driver_data = (void *)(long)BOOT_EFI,
         .ident = "Acer TravelMate X514-51T",
-        .matches = {
+        DMI_MATCH2(
             DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-            DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate X514-51T"),
-        },
+            DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate X514-51T")),
     },
     { }
 };