Signed-off-by: Joe Perches <joe at perches.com> --- drivers/staging/hv/BlkVsc.c | 4 ++-- drivers/staging/hv/StorVsc.c | 4 ++-- drivers/staging/hv/blkvsc_drv.c | 2 +- drivers/staging/hv/include/StorVscApi.h | 4 ++-- drivers/staging/hv/storvsc_drv.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c index 829699c..31636ed 100644 --- a/drivers/staging/hv/BlkVsc.c +++ b/drivers/staging/hv/BlkVsc.c @@ -76,8 +76,8 @@ int BlkVscInitialize(struct driver_object *Driver) int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) { int ret = 0; - STORVSC_DEVICE_INFO *deviceInfo = - (STORVSC_DEVICE_INFO *) AdditionalInfo; + struct storvsc_device_info *deviceInfo = + (struct storvsc_device_info *)AdditionalInfo; DPRINT_ENTER(BLKVSC); diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index f8c5808..6581db7 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -283,8 +283,8 @@ int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) int ret = 0; STORVSC_DEVICE *storDevice; /* VMSTORAGE_CHANNEL_PROPERTIES *props; */ - STORVSC_DEVICE_INFO *deviceInfo = - (STORVSC_DEVICE_INFO *) AdditionalInfo; + struct storvsc_device_info *deviceInfo = + (struct storvsc_device_info *)AdditionalInfo; DPRINT_ENTER(STORVSC); diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 60fd4bb..ddd8bc6 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -270,7 +270,7 @@ static int blkvsc_probe(struct device *device) struct hv_device *device_obj = &device_ctx->device_obj; struct block_device_context *blkdev = NULL; - STORVSC_DEVICE_INFO device_info; + struct storvsc_device_info device_info; int major = 0; int devnum = 0; diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h index 906581f..1eb694c 100644 --- a/drivers/staging/hv/include/StorVscApi.h +++ b/drivers/staging/hv/include/StorVscApi.h @@ -110,11 +110,11 @@ struct storvsc_request { }; -typedef struct _STORVSC_DEVICE_INFO { +struct storvsc_device_info { unsigned int PortNumber; unsigned char PathId; unsigned char TargetId; -} STORVSC_DEVICE_INFO; +}; /* Interface */ diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index b558702..36ed292 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -254,7 +254,7 @@ static int storvsc_probe(struct device *device) struct Scsi_Host *host; struct host_device_context *host_device_ctx; - STORVSC_DEVICE_INFO device_info; + struct storvsc_device_info device_info; DPRINT_ENTER(STORVSC_DRV); -- 1.6.3.1.10.g659a0.dirty