[PATCH 3/8] staging/hv: remove typedef VMSTORAGE_CHANNEL_PROPERTIES
Bill Pemberton
wfp5p at virginia.edu
Fri Aug 7 19:52:16 UTC 2009
The VMSTORAGE_CHANNEL_PROPERTIES typedef is removed. The struct it
defines is now named hv_vmstor_channel
Signed-off-by: Bill Pemberton <wfp5p at virginia.edu>
---
drivers/staging/hv/StorVsc.c | 10 +++++-----
drivers/staging/hv/include/vstorage.h | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index 3778247..c0cc66e 100644
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -315,7 +315,7 @@ StorVscOnDeviceAdd(
{
int ret=0;
STORVSC_DEVICE *storDevice;
- /* VMSTORAGE_CHANNEL_PROPERTIES *props; */
+ /* struct hv_vmstor_channel *props; */
STORVSC_DEVICE_INFO *deviceInfo = (STORVSC_DEVICE_INFO*)AdditionalInfo;
DPRINT_ENTER(STORVSC);
@@ -328,7 +328,7 @@ StorVscOnDeviceAdd(
}
/* Save the channel properties to our storvsc channel */
- /* props = (VMSTORAGE_CHANNEL_PROPERTIES*) channel->offerMsg.Offer.u.Standard.UserDefined; */
+ /* props = (struct hv_vmstor_channel *) channel->offerMsg.Offer.u.Standard.UserDefined; */
/* FIXME: */
/*
@@ -525,18 +525,18 @@ StorVscConnectToVsp(
)
{
int ret=0;
- VMSTORAGE_CHANNEL_PROPERTIES props;
+ struct hv_vmstor_channel props;
STORVSC_DRIVER_OBJECT *storDriver = (STORVSC_DRIVER_OBJECT*) Device->Driver;;
- memset(&props, sizeof(VMSTORAGE_CHANNEL_PROPERTIES), 0);
+ memset(&props, sizeof(props), 0);
/* Open the channel */
ret = Device->Driver->VmbusChannelInterface.Open(Device,
storDriver->RingBufferSize,
storDriver->RingBufferSize,
(void *)&props,
- sizeof(VMSTORAGE_CHANNEL_PROPERTIES),
+ sizeof(props),
StorVscOnChannelCallback,
Device
);
diff --git a/drivers/staging/hv/include/vstorage.h b/drivers/staging/hv/include/vstorage.h
index 2ee0418..c133960 100644
--- a/drivers/staging/hv/include/vstorage.h
+++ b/drivers/staging/hv/include/vstorage.h
@@ -176,7 +176,7 @@ C_ASSERT((sizeof(sizeof hv_vmscsi_request) % 4) == 0);
/* properties of the channel. */
-typedef struct
+struct hv_vmstor_channel
{
unsigned short ProtocolVersion;
unsigned char PathId;
@@ -198,9 +198,9 @@ typedef struct
unsigned long long UniqueId;
-} VMSTORAGE_CHANNEL_PROPERTIES, *PVMSTORAGE_CHANNEL_PROPERTIES;
+};
-C_ASSERT((sizeof(VMSTORAGE_CHANNEL_PROPERTIES) % 4) == 0);
+C_ASSERT((sizeof(struct hv_vmstor_channel) % 4) == 0);
@@ -273,7 +273,7 @@ struct hv_vstor_packet
/* Structure used to query channel properties. */
- VMSTORAGE_CHANNEL_PROPERTIES StorageChannelProperties;
+ struct hv_vmstor_channel StorageChannelProperties;
/* Used during version negotiations. */
--
1.6.2.5
More information about the devel
mailing list