From npalix@diku.dk Wed Jul 29 06:39:41 2009 From: Nicolas Palix Date: Wed, 29 Jul 2009 14:09:45 +0200 Subject: Staging: hv: Remove typedef DRIVER_OBJECT and PDRIVER_OBJECT To: gregkh@suse.de, hjanssen@microsoft.com, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <200907291409.46342.npalix@diku.dk> Content-Disposition: inline typedef DRIVER_OBJECT and PDRIVER_OBJECT are removed and their usages are replace by the use of struct hv_driver and struct hv_driver * respectively. Here is the semantic patch generated to perform this transformation: (http://coccinelle.lip6.fr/) // @rm_DRIVER_OBJECT@ @@ -typedef struct _DRIVER_OBJECT +struct hv_driver {...} -DRIVER_OBJECT ; @rm_PDRIVER_OBJECT@ @@ -typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT; +struct hv_driver; @fixtypedef_DRIVER_OBJECT@ typedef DRIVER_OBJECT; @@ -DRIVER_OBJECT +struct hv_driver @fixstruct__DRIVER_OBJECT@ @@ struct -_DRIVER_OBJECT +hv_driver @fixtypedef_PDRIVER_OBJECT@ typedef PDRIVER_OBJECT; @@ -PDRIVER_OBJECT +struct hv_driver* // Signed-off-by: Nicolas Palix Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- 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 | 26 ++++++++++---------------- drivers/staging/hv/include/vmbus.h | 4 ++-- drivers/staging/hv/vmbus_drv.c | 2 +- 10 files changed, 37 insertions(+), 43 deletions(-) --- a/drivers/staging/hv/BlkVsc.c +++ b/drivers/staging/hv/BlkVsc.c @@ -41,7 +41,7 @@ BlkVscOnDeviceAdd( int BlkVscInitialize( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ) { STORVSC_DRIVER_OBJECT* storDriver = (STORVSC_DRIVER_OBJECT*)Driver; --- a/drivers/staging/hv/include/NetVscApi.h +++ b/drivers/staging/hv/include/NetVscApi.h @@ -109,7 +109,7 @@ typedef struct _NETVSC_PACKET { /* Represents the net vsc driver */ typedef struct _NETVSC_DRIVER_OBJECT { - DRIVER_OBJECT Base; /* Must be the first field */ + struct hv_driver Base; /* Must be the first field */ u32 RingBufferSize; u32 RequestExtSize; @@ -147,7 +147,7 @@ typedef struct _NETVSC_DEVICE_INFO { int NetVscInitialize( - DRIVER_OBJECT* drv + struct hv_driver *drv ); #endif /* _NETVSC_API_H_ */ --- a/drivers/staging/hv/include/StorVscApi.h +++ b/drivers/staging/hv/include/StorVscApi.h @@ -98,7 +98,7 @@ typedef struct _STORVSC_REQUEST { /* Represents the block vsc driver */ typedef struct _STORVSC_DRIVER_OBJECT { - DRIVER_OBJECT Base; /* Must be the first field */ + struct hv_driver Base; /* Must be the first field */ /* Set by caller (in bytes) */ u32 RingBufferSize; @@ -129,11 +129,11 @@ typedef struct _STORVSC_DEVICE_INFO { int StorVscInitialize( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ); int BlkVscInitialize( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ); #endif /* _STORVSC_API_H_ */ --- a/drivers/staging/hv/include/VmbusApi.h +++ b/drivers/staging/hv/include/VmbusApi.h @@ -34,13 +34,6 @@ #define MAX_PAGE_BUFFER_COUNT 16 #define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */ - - -/* Fwd declarations */ - -typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT; - - /* Data types */ @@ -68,19 +61,20 @@ typedef struct _MULTIPAGE_BUFFER { #pragma pack(pop) +struct hv_driver; struct hv_device; /* 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 hv_driver *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 hv_driver *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 hv_driver *drv); +typedef void (*PFN_ON_DPC)(struct hv_driver *drv); typedef void (*PFN_GET_CHANNEL_OFFERS)(void); typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(GUID DeviceType, GUID DeviceInstance, void *Context); @@ -205,7 +199,7 @@ typedef struct _VMBUS_CHANNEL_INTERFACE typedef void (*VMBUS_GET_CHANNEL_INTERFACE)(VMBUS_CHANNEL_INTERFACE *Interface); /* Base driver object */ -typedef struct _DRIVER_OBJECT { +struct hv_driver { const char* name; GUID deviceType; /* the device type supported by this driver */ @@ -215,12 +209,12 @@ 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 hv_driver *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 */ @@ -231,7 +225,7 @@ struct hv_device { /* Vmbus driver object */ typedef struct _VMBUS_DRIVER_OBJECT { - DRIVER_OBJECT Base; /* !! Must be the 1st field !! */ + struct hv_driver Base; /* !! Must be the 1st field !! */ /* Set by the caller */ PFN_ON_CHILDDEVICE_CREATE OnChildDeviceCreate; @@ -257,7 +251,7 @@ typedef struct _VMBUS_DRIVER_OBJECT { int VmbusInitialize( - DRIVER_OBJECT* drv + struct hv_driver *drv ); #endif /* _VMBUS_API_H_ */ --- a/drivers/staging/hv/include/vmbus.h +++ b/drivers/staging/hv/include/vmbus.h @@ -33,8 +33,8 @@ /* Data types */ -typedef int (*PFN_DRIVERINITIALIZE)(DRIVER_OBJECT *drv); -typedef int (*PFN_DRIVEREXIT)(DRIVER_OBJECT *drv); +typedef int (*PFN_DRIVERINITIALIZE)(struct hv_driver *drv); +typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv); struct driver_context { GUID class_id; --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c @@ -51,7 +51,7 @@ NetVscOnDeviceRemove( static void NetVscOnCleanup( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ); static void @@ -231,7 +231,7 @@ Description: --*/ int NetVscInitialize( - DRIVER_OBJECT *drv + struct hv_driver *drv ) { NETVSC_DRIVER_OBJECT* driver = (NETVSC_DRIVER_OBJECT*)drv; @@ -983,7 +983,7 @@ Description: --*/ void NetVscOnCleanup( - DRIVER_OBJECT *drv + struct hv_driver *drv ) { DPRINT_ENTER(NETVSC); --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -168,7 +168,7 @@ RndisFilterOnDeviceRemove( static void RndisFilterOnCleanup( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ); static int @@ -1032,7 +1032,7 @@ RndisFilterOnDeviceRemove( static void RndisFilterOnCleanup( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ) { DPRINT_ENTER(NETVSC); --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -118,7 +118,7 @@ StorVscOnHostReset( static void StorVscOnCleanup( - DRIVER_OBJECT *Device + struct hv_driver *Device ); static void @@ -263,7 +263,7 @@ Description: --*/ int StorVscInitialize( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ) { STORVSC_DRIVER_OBJECT* storDriver = (STORVSC_DRIVER_OBJECT*)Driver; @@ -807,7 +807,7 @@ Description: --*/ void StorVscOnCleanup( - DRIVER_OBJECT *Driver + struct hv_driver *Driver ) { DPRINT_ENTER(STORVSC); --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c @@ -45,7 +45,7 @@ static const GUID gVmbusDeviceId={ .Data = {0xfc, 0x60, 0x37, 0xac, 0xdf, 0x9a, 0xaa, 0x40, 0x94, 0x27, 0xa7, 0x0e, 0xd6, 0xde, 0x95, 0xc5} }; -static DRIVER_OBJECT* gDriver; /* vmbus driver object */ +static struct hv_driver *gDriver; /* vmbus driver object */ static struct hv_device* gDevice; /* vmbus root device */ @@ -82,22 +82,22 @@ VmbusOnDeviceRemove( static void VmbusOnCleanup( - DRIVER_OBJECT* drv + struct hv_driver *drv ); static int VmbusOnISR( - DRIVER_OBJECT* drv + struct hv_driver *drv ); static void VmbusOnMsgDPC( - DRIVER_OBJECT* drv + struct hv_driver *drv ); static void VmbusOnEventDPC( - DRIVER_OBJECT* drv + struct hv_driver *drv ); /*++; @@ -111,7 +111,7 @@ Description: --*/ int VmbusInitialize( - DRIVER_OBJECT* drv + struct hv_driver *drv ) { VMBUS_DRIVER_OBJECT* driver = (VMBUS_DRIVER_OBJECT*)drv; @@ -377,7 +377,7 @@ Description: --*/ void VmbusOnCleanup( - DRIVER_OBJECT* drv + struct hv_driver *drv ) { /* VMBUS_DRIVER_OBJECT* driver = (VMBUS_DRIVER_OBJECT*)drv; */ @@ -401,7 +401,7 @@ Description: --*/ void VmbusOnMsgDPC( - DRIVER_OBJECT* drv + struct hv_driver *drv ) { void *page_addr = gHvContext.synICMessagePage[0]; @@ -460,7 +460,7 @@ Description: --*/ void VmbusOnEventDPC( - DRIVER_OBJECT* drv + struct hv_driver* drv ) { /* TODO: Process any events */ @@ -479,7 +479,7 @@ Description: --*/ int VmbusOnISR( - DRIVER_OBJECT* drv + struct hv_driver *drv ) { /* VMBUS_DRIVER_OBJECT* driver = (VMBUS_DRIVER_OBJECT*)drv; */ --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -765,7 +765,7 @@ static int vmbus_match(struct device *de 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 hv_driver 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; DPRINT_INFO(VMBUS_DRV, "device object (%p) set to driver object (%p)", &device_ctx->device_obj, device_ctx->device_obj.Driver);