diff options
-rw-r--r-- | drivers/staging/hv/Channel.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/Channel.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/ChannelInterface.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/ChannelMgmt.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/ChannelMgmt.h | 8 | ||||
-rw-r--r-- | drivers/staging/hv/Connection.c | 2 | ||||
-rw-r--r-- | drivers/staging/hv/Hv.c | 2 | ||||
-rw-r--r-- | drivers/staging/hv/Hv.h | 16 | ||||
-rw-r--r-- | drivers/staging/hv/RingBuffer.c | 2 | ||||
-rw-r--r-- | drivers/staging/hv/RingBuffer.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/Sources.c | 1 | ||||
-rw-r--r-- | drivers/staging/hv/Vmbus.c | 2 | ||||
-rw-r--r-- | drivers/staging/hv/VmbusPrivate.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/include/ChannelMessages.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/osd.c | 3 | ||||
-rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 15 |
16 files changed, 37 insertions, 34 deletions
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index 0b78604c40b..45b8c1b3d22 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c | |||
@@ -22,8 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | ||
25 | #include "osd.h" | 25 | #include "include/osd.h" |
26 | #include "logging.h" | 26 | #include "include/logging.h" |
27 | 27 | ||
28 | #include "VmbusPrivate.h" | 28 | #include "VmbusPrivate.h" |
29 | 29 | ||
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h index 117b2e1bb7c..6fa49ce0963 100644 --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _CHANNEL_H_ | 25 | #ifndef _CHANNEL_H_ |
26 | #define _CHANNEL_H_ | 26 | #define _CHANNEL_H_ |
27 | 27 | ||
28 | #include "osd.h" | 28 | #include "include/osd.h" |
29 | #include "ChannelMgmt.h" | 29 | #include "ChannelMgmt.h" |
30 | 30 | ||
31 | #pragma pack(push,1) | 31 | #pragma pack(push,1) |
diff --git a/drivers/staging/hv/ChannelInterface.h b/drivers/staging/hv/ChannelInterface.h index 8f5a4a99269..b9d04461067 100644 --- a/drivers/staging/hv/ChannelInterface.h +++ b/drivers/staging/hv/ChannelInterface.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _CHANNEL_INTERFACE_H_ | 25 | #ifndef _CHANNEL_INTERFACE_H_ |
26 | #define _CHANNEL_INTERFACE_H_ | 26 | #define _CHANNEL_INTERFACE_H_ |
27 | 27 | ||
28 | #include "VmbusApi.h" | 28 | #include "include/VmbusApi.h" |
29 | 29 | ||
30 | INTERNAL void | 30 | INTERNAL void |
31 | GetChannelInterface( | 31 | GetChannelInterface( |
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index c058d53321c..59c772f1770 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c | |||
@@ -22,8 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | ||
25 | #include "osd.h" | 25 | #include "include/osd.h" |
26 | #include "logging.h" | 26 | #include "include/logging.h" |
27 | 27 | ||
28 | #include "VmbusPrivate.h" | 28 | #include "VmbusPrivate.h" |
29 | 29 | ||
diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h index d5ba5d13594..a8223d0d245 100644 --- a/drivers/staging/hv/ChannelMgmt.h +++ b/drivers/staging/hv/ChannelMgmt.h | |||
@@ -25,12 +25,12 @@ | |||
25 | #ifndef _CHANNEL_MGMT_H_ | 25 | #ifndef _CHANNEL_MGMT_H_ |
26 | #define _CHANNEL_MGMT_H_ | 26 | #define _CHANNEL_MGMT_H_ |
27 | 27 | ||
28 | #include "osd.h" | 28 | #include "include/osd.h" |
29 | #include "List.h" | 29 | #include "include/List.h" |
30 | #include "RingBuffer.h" | 30 | #include "RingBuffer.h" |
31 | 31 | ||
32 | #include "VmbusChannelInterface.h" | 32 | #include "include/VmbusChannelInterface.h" |
33 | #include "ChannelMessages.h" | 33 | #include "include/ChannelMessages.h" |
34 | 34 | ||
35 | 35 | ||
36 | 36 | ||
diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c index fba195aa4b9..c60ff8e9416 100644 --- a/drivers/staging/hv/Connection.c +++ b/drivers/staging/hv/Connection.c | |||
@@ -22,7 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | ||
25 | #include "logging.h" | 25 | #include "include/logging.h" |
26 | 26 | ||
27 | #include "VmbusPrivate.h" | 27 | #include "VmbusPrivate.h" |
28 | 28 | ||
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index 7aec8c94b2e..09321071346 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c | |||
@@ -22,7 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | ||
25 | #include "logging.h" | 25 | #include "include/logging.h" |
26 | #include "VmbusPrivate.h" | 26 | #include "VmbusPrivate.h" |
27 | 27 | ||
28 | // | 28 | // |
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h index cbc77d2d086..beb3b28e793 100644 --- a/drivers/staging/hv/Hv.h +++ b/drivers/staging/hv/Hv.h | |||
@@ -25,23 +25,23 @@ | |||
25 | #ifndef __HV_H__ | 25 | #ifndef __HV_H__ |
26 | #define __HV_H__ | 26 | #define __HV_H__ |
27 | 27 | ||
28 | #include "osd.h" | 28 | #include "include/osd.h" |
29 | 29 | ||
30 | #include "HvTypes.h" | 30 | #include "include/HvTypes.h" |
31 | #include "HvStatus.h" | 31 | #include "include/HvStatus.h" |
32 | //#include "HvVmApi.h" | 32 | //#include "HvVmApi.h" |
33 | //#include "HvKeApi.h" | 33 | //#include "HvKeApi.h" |
34 | //#include "HvMmApi.h" | 34 | //#include "HvMmApi.h" |
35 | //#include "HvCpuApi.h" | 35 | //#include "HvCpuApi.h" |
36 | #include "HvHalApi.h" | 36 | #include "include/HvHalApi.h" |
37 | #include "HvVpApi.h" | 37 | #include "include/HvVpApi.h" |
38 | //#include "HvTrApi.h" | 38 | //#include "HvTrApi.h" |
39 | #include "HvSynicApi.h" | 39 | #include "include/HvSynicApi.h" |
40 | //#include "HvAmApi.h" | 40 | //#include "HvAmApi.h" |
41 | //#include "HvHkApi.h" | 41 | //#include "HvHkApi.h" |
42 | //#include "HvValApi.h" | 42 | //#include "HvValApi.h" |
43 | #include "HvHcApi.h" | 43 | #include "include/HvHcApi.h" |
44 | #include "HvPtApi.h" | 44 | #include "include/HvPtApi.h" |
45 | 45 | ||
46 | enum | 46 | enum |
47 | { | 47 | { |
diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c index 57d944e883b..31db6f96c52 100644 --- a/drivers/staging/hv/RingBuffer.c +++ b/drivers/staging/hv/RingBuffer.c | |||
@@ -22,7 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | ||
25 | #include "logging.h" | 25 | #include "include/logging.h" |
26 | #include "RingBuffer.h" | 26 | #include "RingBuffer.h" |
27 | 27 | ||
28 | // | 28 | // |
diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h index 9af5df006e3..99d75c305bc 100644 --- a/drivers/staging/hv/RingBuffer.h +++ b/drivers/staging/hv/RingBuffer.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _RING_BUFFER_H_ | 25 | #ifndef _RING_BUFFER_H_ |
26 | #define _RING_BUFFER_H_ | 26 | #define _RING_BUFFER_H_ |
27 | 27 | ||
28 | #include "osd.h" | 28 | #include "include/osd.h" |
29 | 29 | ||
30 | typedef struct _SG_BUFFER_LIST { | 30 | typedef struct _SG_BUFFER_LIST { |
31 | PVOID Data; | 31 | PVOID Data; |
diff --git a/drivers/staging/hv/Sources.c b/drivers/staging/hv/Sources.c index bc154642be7..573700f58d2 100644 --- a/drivers/staging/hv/Sources.c +++ b/drivers/staging/hv/Sources.c | |||
@@ -21,6 +21,7 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define KERNEL_2_6_27 | ||
24 | 25 | ||
25 | #include "Vmbus.c" | 26 | #include "Vmbus.c" |
26 | #include "Hv.c" | 27 | #include "Hv.c" |
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 54a120dc055..ace782471ac 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c | |||
@@ -22,7 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | ||
25 | #include "logging.h" | 25 | #include "include/logging.h" |
26 | #include "VersionInfo.h" | 26 | #include "VersionInfo.h" |
27 | #include "VmbusPrivate.h" | 27 | #include "VmbusPrivate.h" |
28 | 28 | ||
diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h index 5e86165dea2..9027c8cf70c 100644 --- a/drivers/staging/hv/VmbusPrivate.h +++ b/drivers/staging/hv/VmbusPrivate.h | |||
@@ -30,14 +30,14 @@ | |||
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include "Hv.h" | 32 | #include "Hv.h" |
33 | #include "VmbusApi.h" | 33 | #include "include/VmbusApi.h" |
34 | #include "Channel.h" | 34 | #include "Channel.h" |
35 | #include "ChannelMgmt.h" | 35 | #include "ChannelMgmt.h" |
36 | #include "ChannelInterface.h" | 36 | #include "ChannelInterface.h" |
37 | //#include "ChannelMessages.h" | 37 | //#include "ChannelMessages.h" |
38 | #include "RingBuffer.h" | 38 | #include "RingBuffer.h" |
39 | //#include "Packet.h" | 39 | //#include "Packet.h" |
40 | #include "List.h" | 40 | #include "include/List.h" |
41 | 41 | ||
42 | // | 42 | // |
43 | // Defines | 43 | // Defines |
diff --git a/drivers/staging/hv/include/ChannelMessages.h b/drivers/staging/hv/include/ChannelMessages.h index bd2159bdc2c..27a88ea6df5 100644 --- a/drivers/staging/hv/include/ChannelMessages.h +++ b/drivers/staging/hv/include/ChannelMessages.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #pragma once | 25 | #pragma once |
26 | 26 | ||
27 | #include <VmbusPacketFormat.h> | 27 | #include "VmbusPacketFormat.h" |
28 | 28 | ||
29 | #define C_ASSERT(x) | 29 | #define C_ASSERT(x) |
30 | typedef UINT32 NTSTATUS; | 30 | typedef UINT32 NTSTATUS; |
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index 83885252049..bfb2c8e97d7 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c | |||
@@ -21,6 +21,7 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define KERNEL_2_6_27 | ||
24 | 25 | ||
25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
@@ -46,7 +47,7 @@ | |||
46 | #include <asm/kmap_types.h> | 47 | #include <asm/kmap_types.h> |
47 | #include <asm/atomic.h> | 48 | #include <asm/atomic.h> |
48 | 49 | ||
49 | #include "osd.h" | 50 | #include "include/osd.h" |
50 | 51 | ||
51 | // | 52 | // |
52 | // Data types | 53 | // Data types |
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 0acf42c3566..6e85c38eb84 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c | |||
@@ -21,6 +21,7 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define KERNEL_2_6_27 | ||
24 | 25 | ||
25 | #include <linux/init.h> | 26 | #include <linux/init.h> |
26 | #include <linux/module.h> | 27 | #include <linux/module.h> |
@@ -29,8 +30,8 @@ | |||
29 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
30 | #include <linux/sysctl.h> | 31 | #include <linux/sysctl.h> |
31 | 32 | ||
32 | #include "logging.h" | 33 | #include "include/logging.h" |
33 | #include "vmbus.h" | 34 | #include "include/vmbus.h" |
34 | 35 | ||
35 | // | 36 | // |
36 | // Defines | 37 | // Defines |
@@ -451,7 +452,7 @@ int vmbus_bus_init(PFN_DRIVERINITIALIZE pfn_drv_init) | |||
451 | goto cleanup; | 452 | goto cleanup; |
452 | } | 453 | } |
453 | //strcpy(dev_ctx->device.bus_id, dev_ctx->device_obj.name); | 454 | //strcpy(dev_ctx->device.bus_id, dev_ctx->device_obj.name); |
454 | sprintf(dev_ctx->device.bus_id, "vmbus_0_0"); | 455 | dev_set_name(&dev_ctx->device, "vmbus_0_0"); |
455 | memcpy(&dev_ctx->class_id, &dev_ctx->device_obj.deviceType, sizeof(GUID)); | 456 | memcpy(&dev_ctx->class_id, &dev_ctx->device_obj.deviceType, sizeof(GUID)); |
456 | memcpy(&dev_ctx->device_id, &dev_ctx->device_obj.deviceInstance, sizeof(GUID)); | 457 | memcpy(&dev_ctx->device_id, &dev_ctx->device_obj.deviceInstance, sizeof(GUID)); |
457 | 458 | ||
@@ -656,16 +657,16 @@ static int vmbus_child_device_register(DEVICE_OBJECT* root_device_obj, DEVICE_OB | |||
656 | // | 657 | // |
657 | // Make sure we are not registered already | 658 | // Make sure we are not registered already |
658 | // | 659 | // |
659 | if (child_device_ctx->device.bus_id[0] != '\0') | 660 | if (strlen(dev_name(&child_device_ctx->device)) != 0) |
660 | { | 661 | { |
661 | DPRINT_ERR(VMBUS_DRV, "child device (%p) already registered - busid %s", child_device_ctx, child_device_ctx->device.bus_id); | 662 | DPRINT_ERR(VMBUS_DRV, "child device (%p) already registered - busid %s", child_device_ctx, dev_name(&child_device_ctx->device)); |
662 | 663 | ||
663 | ret = -1; | 664 | ret = -1; |
664 | goto Cleanup; | 665 | goto Cleanup; |
665 | } | 666 | } |
666 | 667 | ||
667 | // Set the device bus id. Otherwise, device_register()will fail. | 668 | // Set the device bus id. Otherwise, device_register()will fail. |
668 | sprintf(child_device_ctx->device.bus_id, "vmbus_0_%d", InterlockedIncrement(&device_num)); | 669 | dev_set_name(&child_device_ctx->device, "vmbus_0_%d", InterlockedIncrement(&device_num)); |
669 | 670 | ||
670 | // The new device belongs to this bus | 671 | // The new device belongs to this bus |
671 | child_device_ctx->device.bus = &g_vmbus_drv.bus; //device->dev.bus; | 672 | child_device_ctx->device.bus = &g_vmbus_drv.bus; //device->dev.bus; |
@@ -924,7 +925,7 @@ static int vmbus_probe(struct device *child_device) | |||
924 | ret = device_ctx->probe_error = driver_ctx->probe(child_device); | 925 | ret = device_ctx->probe_error = driver_ctx->probe(child_device); |
925 | if (ret != 0) | 926 | if (ret != 0) |
926 | { | 927 | { |
927 | DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s (%p) on driver %s (%d)...", child_device->bus_id, child_device, child_device->driver->name, ret); | 928 | DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s (%p) on driver %s (%d)...", dev_name(child_device), child_device, child_device->driver->name, ret); |
928 | 929 | ||
929 | #ifdef KERNEL_2_6_27 | 930 | #ifdef KERNEL_2_6_27 |
930 | INIT_WORK(&device_ctx->probe_failed_work_item, vmbus_probe_failed_cb); | 931 | INIT_WORK(&device_ctx->probe_failed_work_item, vmbus_probe_failed_cb); |