Drivers: hv: vmbus: fix the building warning with hyperv-keyboard

PATCH New Dexuan Cui 1 participant 1 message Dec 20, 2015

Subsystems (2)

Input drivers Hyper-V/Azure core and drivers

lore

Share & tools

lore

Dexuan Cui

author maintainer

2015-12-20 12:47 UTC #0 lore raw

PATCH 1/1 Drivers: hv: vmbus: fix the building warning with hyperv-keyboard

With the recent change af3ff643ea91ba64dd8d0b1cbed54d44512f96cd (Drivers: hv: vmbus: Use uuid_le type consistently), we always get this warning:

CC [M] drivers/input/serio/hyperv-keyboard.o
drivers/input/serio/hyperv-keyboard.c:427:2: warning: missing braces around
initializer [-Wmissing-braces]
{ HV_KBD_GUID, },
^
drivers/input/serio/hyperv-keyboard.c:427:2: warning: (near initialization
for ‘id_table[0].guid.b’) [-Wmissing-braces]

The patch fixes the warning.

Signed-off-by Dexuan Cui <[email protected]>

---
 drivers/input/serio/hyperv-keyboard.c | 10 ----------
 include/linux/hyperv.h                |  8 ++++++++
 2 files changed, 8 insertions(+), 10 deletions(-)

drivers/input/serio/hyperv-keyboard.c +0 ~~-10~~

index e74e5d6..c948866 100644
@@ -412,16 +412,6 @@ static int hv_kbd_remove(struct hv_device *hv_dev)
 	return 0;
 }
 
-/*
- * Keyboard GUID
- * {f912ad6d-2b17-48ea-bd65-f927a61c7684}
- */
-#define HV_KBD_GUID \
-	.guid = { \
-			0x6d, 0xad, 0x12, 0xf9, 0x17, 0x2b, 0xea, 0x48, \
-			0xbd, 0x65, 0xf9, 0x27, 0xa6, 0x1c, 0x76, 0x84 \
-	}
-
 static const struct hv_vmbus_device_id id_table[] = {
 	/* Keyboard guid */
 	{ HV_KBD_GUID, },

include/linux/hyperv.h +8 -0

index 179ff33..753dbad 100644
@@ -1079,6 +1079,14 @@ u64 hv_do_hypercall(u64 control, void *input, void *output);
 			0x8b, 0xa1, 0xa1, 0xf3, 0xf9, 0x5a)
 
 /*
+ * Keyboard GUID
+ * {f912ad6d-2b17-48ea-bd65-f927a61c7684}
+ */
+#define HV_KBD_GUID \
+	.guid = UUID_LE(0xf912ad6d, 0x2b17, 0x48ea, 0xbd, 0x65, \
+			0xf9, 0x27, 0xa6, 0x1c, 0x76, 0x84)
+
+/*
  * VSS (Backup/Restore) GUID
  */
 #define HV_VSS_GUID \

Signature · 1 line

2.1.0