[PATCH 03/13] staging/hv: Use struct driver_object

Joe Perches joe at perches.com
Thu Jul 30 00:40:56 UTC 2009


Signed-off-by: Joe Perches <joe at perches.com>
---
 drivers/staging/hv/BlkVsc.c             |    2 +-
 drivers/staging/hv/NetVsc.c             |    6 +++---
 drivers/staging/hv/RndisFilter.c        |    4 ++--
 drivers/staging/hv/StorVsc.c            |    6 +++---
 drivers/staging/hv/Vmbus.c              |   20 ++++++++++----------
 drivers/staging/hv/include/NetVscApi.h  |    4 ++--
 drivers/staging/hv/include/StorVscApi.h |    6 +++---
 drivers/staging/hv/include/VmbusApi.h   |   20 ++++++++++----------
 drivers/staging/hv/include/vmbus.h      |    4 ++--
 drivers/staging/hv/vmbus_drv.c          |    2 +-
 10 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c
index 1042477..29217a5 100644
--- a/drivers/staging/hv/BlkVsc.c
+++ b/drivers/staging/hv/BlkVsc.c
@@ -36,7 +36,7 @@ static const GUID gBlkVscDeviceType = {
 /* Static routines */
 static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo);
 
-int BlkVscInitialize(DRIVER_OBJECT * Driver)
+int BlkVscInitialize(struct driver_object *Driver)
 {
 	STORVSC_DRIVER_OBJECT *storDriver = (STORVSC_DRIVER_OBJECT *) Driver;
 	int ret = 0;
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index aa65587..752f5b0 100644
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -42,7 +42,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo);
 
 static int NetVscOnDeviceRemove(struct hv_device *Device);
 
-static void NetVscOnCleanup(DRIVER_OBJECT * Driver);
+static void NetVscOnCleanup(struct driver_object *Driver);
 
 static void NetVscOnChannelCallback(void *context);
 
@@ -179,7 +179,7 @@ Description:
 	Main entry point
 
 --*/
-int NetVscInitialize(DRIVER_OBJECT * drv)
+int NetVscInitialize(struct driver_object *drv)
 {
 	NETVSC_DRIVER_OBJECT *driver = (NETVSC_DRIVER_OBJECT *) drv;
 	int ret = 0;
@@ -940,7 +940,7 @@ Description:
 	Perform any cleanup when the driver is removed
 
 --*/
-void NetVscOnCleanup(DRIVER_OBJECT * drv)
+void NetVscOnCleanup(struct driver_object *drv)
 {
 	DPRINT_ENTER(NETVSC);
 
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index 8c9bef9..8750b43 100644
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -118,7 +118,7 @@ RndisFilterOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo);
 
 static int RndisFilterOnDeviceRemove(struct hv_device *Device);
 
-static void RndisFilterOnCleanup(DRIVER_OBJECT * Driver);
+static void RndisFilterOnCleanup(struct driver_object *Driver);
 
 static int RndisFilterOnOpen(struct hv_device *Device);
 
@@ -927,7 +927,7 @@ static int RndisFilterOnDeviceRemove(struct hv_device *Device)
 	return 0;
 }
 
-static void RndisFilterOnCleanup(DRIVER_OBJECT * Driver)
+static void RndisFilterOnCleanup(struct driver_object *Driver)
 {
 	DPRINT_ENTER(NETVSC);
 
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index a536a66..7975d0a 100644
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -96,7 +96,7 @@ StorVscOnIORequest(struct hv_device *Device, STORVSC_REQUEST * Request);
 
 static int StorVscOnHostReset(struct hv_device *Device);
 
-static void StorVscOnCleanup(DRIVER_OBJECT * Device);
+static void StorVscOnCleanup(struct driver_object *Device);
 
 static void StorVscOnChannelCallback(void *Context);
 
@@ -219,7 +219,7 @@ Description:
 	Main entry point
 
 --*/
-int StorVscInitialize(DRIVER_OBJECT * Driver)
+int StorVscInitialize(struct driver_object *Driver)
 {
 	STORVSC_DRIVER_OBJECT *storDriver = (STORVSC_DRIVER_OBJECT *) Driver;
 	int ret = 0;
@@ -779,7 +779,7 @@ Description:
 	Perform any cleanup when the driver is removed
 
 --*/
-void StorVscOnCleanup(DRIVER_OBJECT * Driver)
+void StorVscOnCleanup(struct driver_object *Driver)
 {
 	DPRINT_ENTER(STORVSC);
 	DPRINT_EXIT(STORVSC);
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index 26c93db..db0d87b 100644
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -48,7 +48,7 @@ static const GUID gVmbusDeviceId = {
 	     0x0e, 0xd6, 0xde, 0x95, 0xc5}
 };
 
-static DRIVER_OBJECT *gDriver;	/* vmbus driver object */
+static struct driver_object *gDriver;	/* vmbus driver object */
 static struct hv_device *gDevice;	/* vmbus root device */
 
 /* Internal routines */
@@ -65,13 +65,13 @@ static int VmbusOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo);
 
 static int VmbusOnDeviceRemove(struct hv_device *dev);
 
-static void VmbusOnCleanup(DRIVER_OBJECT * drv);
+static void VmbusOnCleanup(struct driver_object *drv);
 
-static int VmbusOnISR(DRIVER_OBJECT * drv);
+static int VmbusOnISR(struct driver_object *drv);
 
-static void VmbusOnMsgDPC(DRIVER_OBJECT * drv);
+static void VmbusOnMsgDPC(struct driver_object *drv);
 
-static void VmbusOnEventDPC(DRIVER_OBJECT * drv);
+static void VmbusOnEventDPC(struct driver_object *drv);
 
 /*++;
 
@@ -82,7 +82,7 @@ Description:
 	Main entry point
 
 --*/
-int VmbusInitialize(DRIVER_OBJECT * drv)
+int VmbusInitialize(struct driver_object *drv)
 {
 	VMBUS_DRIVER_OBJECT *driver = (VMBUS_DRIVER_OBJECT *) drv;
 	int ret = 0;
@@ -319,7 +319,7 @@ Description:
 	Perform any cleanup when the driver is removed
 
 --*/
-void VmbusOnCleanup(DRIVER_OBJECT * drv)
+void VmbusOnCleanup(struct driver_object *drv)
 {
 	/* VMBUS_DRIVER_OBJECT* driver = (VMBUS_DRIVER_OBJECT*)drv; */
 
@@ -339,7 +339,7 @@ Description:
 	DPC routine to handle messages from the hypervisior
 
 --*/
-void VmbusOnMsgDPC(DRIVER_OBJECT * drv)
+void VmbusOnMsgDPC(struct driver_object *drv)
 {
 	void *page_addr = gHvContext.synICMessagePage[0];
 
@@ -391,7 +391,7 @@ Description:
 	DPC routine to handle events from the hypervisior
 
 --*/
-void VmbusOnEventDPC(DRIVER_OBJECT * drv)
+void VmbusOnEventDPC(struct driver_object *drv)
 {
 	/* TODO: Process any events */
 	VmbusOnEvents();
@@ -406,7 +406,7 @@ Description:
 	ISR routine
 
 --*/
-int VmbusOnISR(DRIVER_OBJECT * drv)
+int VmbusOnISR(struct driver_object *drv)
 {
 	/* VMBUS_DRIVER_OBJECT* driver = (VMBUS_DRIVER_OBJECT*)drv; */
 
diff --git a/drivers/staging/hv/include/NetVscApi.h b/drivers/staging/hv/include/NetVscApi.h
index edcca04..90482d1 100644
--- a/drivers/staging/hv/include/NetVscApi.h
+++ b/drivers/staging/hv/include/NetVscApi.h
@@ -102,7 +102,7 @@ typedef struct _NETVSC_PACKET {
 
 /* Represents the net vsc driver */
 typedef struct _NETVSC_DRIVER_OBJECT {
-	DRIVER_OBJECT Base;	/* Must be the first field */
+	struct driver_object Base;	/* Must be the first field */
 
 	u32 RingBufferSize;
 	u32 RequestExtSize;
@@ -136,6 +136,6 @@ typedef struct _NETVSC_DEVICE_INFO {
 
 /* Interface */
 
-int NetVscInitialize(DRIVER_OBJECT * drv);
+int NetVscInitialize(struct driver_object *drv);
 
 #endif /* _NETVSC_API_H_ */
diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h
index 2b7e1f0..597aca3 100644
--- a/drivers/staging/hv/include/StorVscApi.h
+++ b/drivers/staging/hv/include/StorVscApi.h
@@ -91,7 +91,7 @@ typedef struct _STORVSC_REQUEST {
 
 /* Represents the block vsc driver */
 typedef struct _STORVSC_DRIVER_OBJECT {
-	DRIVER_OBJECT Base;	/* Must be the first field */
+	struct driver_object Base;	/* Must be the first field */
 
 	/* Set by caller (in bytes) */
 	u32 RingBufferSize;
@@ -119,7 +119,7 @@ typedef struct _STORVSC_DEVICE_INFO {
 
 /* Interface */
 
-int StorVscInitialize(DRIVER_OBJECT * Driver);
+int StorVscInitialize(struct driver_object *Driver);
 
-int BlkVscInitialize(DRIVER_OBJECT * Driver);
+int BlkVscInitialize(struct driver_object *Driver);
 #endif /* _STORVSC_API_H_ */
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index 0dd6912..ce222fd 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -33,7 +33,6 @@
 
 /* Fwd declarations */
 
-typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT;
 
 /* Data types */
 
@@ -61,19 +60,20 @@ typedef struct _MULTIPAGE_BUFFER {
 #pragma pack(pop)
 
 struct hv_device;
+struct driver_object;
 
 /* All drivers */
 typedef int (*PFN_ON_DEVICEADD) (struct hv_device * Device,
 				 void *AdditionalInfo);
 typedef int (*PFN_ON_DEVICEREMOVE) (struct hv_device * Device);
 typedef char **(*PFN_ON_GETDEVICEIDS) (void);
-typedef void (*PFN_ON_CLEANUP) (PDRIVER_OBJECT Driver);
+typedef void (*PFN_ON_CLEANUP) (struct driver_object *Driver);
 
 /* Vmbus extensions */
-/* typedef int (*PFN_ON_MATCH)(struct hv_device *dev, PDRIVER_OBJECT drv); */
+/* typedef int (*PFN_ON_MATCH)(struct hv_device *dev, struct driver_object *drv); */
 /* typedef int (*PFN_ON_PROBE)(struct hv_device *dev); */
-typedef int (*PFN_ON_ISR) (PDRIVER_OBJECT drv);
-typedef void (*PFN_ON_DPC) (PDRIVER_OBJECT drv);
+typedef int (*PFN_ON_ISR) (struct driver_object *drv);
+typedef void (*PFN_ON_DPC) (struct driver_object *drv);
 typedef void (*PFN_GET_CHANNEL_OFFERS) (void);
 
 typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE) (GUID DeviceType,
@@ -182,7 +182,7 @@ typedef void (*VMBUS_GET_CHANNEL_INTERFACE) (VMBUS_CHANNEL_INTERFACE *
 					     Interface);
 
 /* Base driver object */
-typedef struct _DRIVER_OBJECT {
+struct driver_object {
 	const char *name;
 	GUID deviceType;	/* the device type supported by this driver */
 
@@ -192,11 +192,11 @@ typedef struct _DRIVER_OBJECT {
 	PFN_ON_CLEANUP OnCleanup;
 
 	VMBUS_CHANNEL_INTERFACE VmbusChannelInterface;
-} DRIVER_OBJECT;
+};
 
 /* Base device object */
 struct hv_device {
-	DRIVER_OBJECT *Driver;	/* the driver for this device */
+	struct driver_object *Driver;	/* the driver for this device */
 	char name[64];
 	GUID deviceType;	/* the device type id of this device */
 	GUID deviceInstance;	/* the device instance id of this device */
@@ -206,7 +206,7 @@ struct hv_device {
 
 /* Vmbus driver object */
 typedef struct _VMBUS_DRIVER_OBJECT {
-	DRIVER_OBJECT Base;	/* !! Must be the 1st field !! */
+	struct driver_object Base;	/* !! Must be the 1st field !! */
 
 	/* Set by the caller */
 	PFN_ON_CHILDDEVICE_CREATE OnChildDeviceCreate;
@@ -228,6 +228,6 @@ typedef struct _VMBUS_DRIVER_OBJECT {
 
 /* Interface */
 
-int VmbusInitialize(DRIVER_OBJECT * drv);
+int VmbusInitialize(struct driver_object *drv);
 
 #endif /* _VMBUS_API_H_ */
diff --git a/drivers/staging/hv/include/vmbus.h b/drivers/staging/hv/include/vmbus.h
index 88d371b..586e186 100644
--- a/drivers/staging/hv/include/vmbus.h
+++ b/drivers/staging/hv/include/vmbus.h
@@ -30,8 +30,8 @@
 
 /* Data types */
 
-typedef int (*PFN_DRIVERINITIALIZE) (DRIVER_OBJECT * drv);
-typedef int (*PFN_DRIVEREXIT) (DRIVER_OBJECT * drv);
+typedef int (*PFN_DRIVERINITIALIZE) (struct driver_object *drv);
+typedef int (*PFN_DRIVEREXIT) (struct driver_object *drv);
 
 struct driver_context {
 	GUID class_id;
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 506a50c..d3a03ce 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -795,7 +795,7 @@ static int vmbus_match(struct device *device, struct device_driver *driver)
 	if (memcmp(&device_ctx->class_id, &driver_ctx->class_id, sizeof(GUID))
 	    == 0) {
 		/* !! NOTE: The driver_ctx is not a vmbus_drv_ctx. We typecast it here to access the */
-		/* DRIVER_OBJECT field */
+		/* struct driver_object field */
 		struct vmbus_driver_context *vmbus_drv_ctx =
 		    (struct vmbus_driver_context *)driver_ctx;
 		device_ctx->device_obj.Driver = &vmbus_drv_ctx->drv_obj.Base;
-- 
1.6.3.1.10.g659a0.dirty




More information about the devel mailing list