diff options
| author | Dexuan Cui <decui@microsoft.com> | 2015-12-21 21:21:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-21 22:07:56 +0100 |
| commit | 2048157ad02e65f6327118dd4a7b9c9f1fd12f77 (patch) | |
| tree | bae7c1f26bd773ff5d71b47dd5759791f1a3bd75 | |
| parent | Drivers: hv: ring_buffer: eliminate hv_ringbuffer_peek() (diff) | |
| download | linux-2048157ad02e65f6327118dd4a7b9c9f1fd12f77.tar.xz linux-2048157ad02e65f6327118dd4a7b9c9f1fd12f77.zip | |
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 <decui@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/input/serio/hyperv-keyboard.c | 10 | ||||
| -rw-r--r-- | include/linux/hyperv.h | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c index e74e5d6e5f9f..c948866edf87 100644 --- a/drivers/input/serio/hyperv-keyboard.c +++ b/drivers/input/serio/hyperv-keyboard.c @@ -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, }, diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 179ff330af59..753dbad0bf94 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -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 \ |