Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2048157a authored by Dexuan Cui's avatar Dexuan Cui Committed by Greg Kroah-Hartman
Browse files

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



With the recent change af3ff643
(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: default avatarDexuan Cui <decui@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 940b68e2

drivers/input/serio/hyperv-keyboard.c

+0 −10
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1078,6 +1078,14 @@ u64 hv_do_hypercall(u64 control, void *input, void *output); 
	.guid = UUID_LE(0xcfa8b69e, 0x5b4a, 0x4cc0, 0xb9, 0x8b, \

			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

 */