diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-19 23:17:03 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 19:01:56 (GMT) |
| commit | caf26a31b51a148f70113700fd4f9860b5da3931 (patch) | |
| tree | 3409b37bf85a952830cb423baa76b09ae7a19d85 /drivers/staging/hv/Vmbus.c | |
| parent | 0ccafb365803b3256aa75fd07bf9e5c6814a260d (diff) | |
| download | linux-fsl-qoriq-caf26a31b51a148f70113700fd4f9860b5da3931.tar.xz | |
Staging: hv: osd.h: remove GUID typedef
GUID should not be a typedef. As proof of the problem of typedefs,
look, we are passing 2 of these as a value in functions! Bah...
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/Vmbus.c')
| -rw-r--r-- | drivers/staging/hv/Vmbus.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 2feb7c3..56e8cbb 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c @@ -37,13 +37,19 @@ static const char* gDriverName="vmbus"; * We defined this to be consistent with other devices */ /* {c5295816-f63a-4d5f-8d1a-4daf999ca185} */ -static const GUID gVmbusDeviceType={ - .Data = {0x16, 0x58, 0x29, 0xc5, 0x3a, 0xf6, 0x5f, 0x4d, 0x8d, 0x1a, 0x4d, 0xaf, 0x99, 0x9c, 0xa1, 0x85} +static const struct hv_guid gVmbusDeviceType = { + .data = { + 0x16, 0x58, 0x29, 0xc5, 0x3a, 0xf6, 0x5f, 0x4d, + 0x8d, 0x1a, 0x4d, 0xaf, 0x99, 0x9c, 0xa1, 0x85 + } }; /* {ac3760fc-9adf-40aa-9427-a70ed6de95c5} */ -static const GUID gVmbusDeviceId={ - .Data = {0xfc, 0x60, 0x37, 0xac, 0xdf, 0x9a, 0xaa, 0x40, 0x94, 0x27, 0xa7, 0x0e, 0xd6, 0xde, 0x95, 0xc5} +static const struct hv_guid gVmbusDeviceId = { + .data = { + 0xfc, 0x60, 0x37, 0xac, 0xdf, 0x9a, 0xaa, 0x40, + 0x94, 0x27, 0xa7, 0x0e, 0xd6, 0xde, 0x95, 0xc5 + } }; static struct hv_driver *gDriver; /* vmbus driver object */ @@ -130,7 +136,7 @@ VmbusInitialize( sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); drv->name = gDriverName; - memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID)); + memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid)); /* Setup dispatch table */ driver->Base.OnDeviceAdd = VmbusOnDeviceAdd; @@ -225,8 +231,8 @@ Description: --*/ -struct hv_device *VmbusChildDeviceCreate(GUID DeviceType, - GUID DeviceInstance, +struct hv_device *VmbusChildDeviceCreate(struct hv_guid DeviceType, + struct hv_guid DeviceInstance, void *Context) { VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver; @@ -315,8 +321,8 @@ VmbusOnDeviceAdd( gDevice = dev; - memcpy(&gDevice->deviceType, &gVmbusDeviceType, sizeof(GUID)); - memcpy(&gDevice->deviceInstance, &gVmbusDeviceId, sizeof(GUID)); + memcpy(&gDevice->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid)); + memcpy(&gDevice->deviceInstance, &gVmbusDeviceId, sizeof(struct hv_guid)); /* strcpy(dev->name, "vmbus"); */ /* SynIC setup... */ |