From f25c749bb830890a3e31236857523a57cf6ddc7c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 2 Sep 2009 11:28:55 -0700 Subject: Staging: hv: remove function pointer typedefs from StorVscApi.h function pointer typedefs are allowed in the kernel, but only if they make sense, which they really do not here, as they are not passed around with any kind of frequency. So just spell them all out, it makes the code smaller and easier to understand overall. Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/StorVscApi.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/staging/hv/StorVscApi.h b/drivers/staging/hv/StorVscApi.h index 56193ff663e..69c14066c47 100644 --- a/drivers/staging/hv/StorVscApi.h +++ b/drivers/staging/hv/StorVscApi.h @@ -45,14 +45,6 @@ struct hv_storvsc_request; -/* Data types */ -typedef int (*PFN_ON_IO_REQUEST)(struct hv_device *Device, - struct hv_storvsc_request *Request); -typedef void (*PFN_ON_IO_REQUEST_COMPLTN)(struct hv_storvsc_request *Request); - -typedef int (*PFN_ON_HOST_RESET)(struct hv_device *Device); -typedef void (*PFN_ON_HOST_RESCAN)(struct hv_device *Device); - /* Matches Windows-end */ enum storvsc_request_type{ WRITE_TYPE, @@ -76,7 +68,7 @@ struct hv_storvsc_request { void *Context; - PFN_ON_IO_REQUEST_COMPLTN OnIOCompletion; + void (*OnIOCompletion)(struct hv_storvsc_request *Request); /* This points to the memory after DataBuffer */ void *Extension; @@ -100,11 +92,12 @@ struct storvsc_driver_object { u32 MaxOutstandingRequestsPerChannel; /* Set by the caller to allow us to re-enumerate the bus on the host */ - PFN_ON_HOST_RESCAN OnHostRescan; + void (*OnHostRescan)(struct hv_device *Device); /* Specific to this driver */ - PFN_ON_IO_REQUEST OnIORequest; - PFN_ON_HOST_RESET OnHostReset; + int (*OnIORequest)(struct hv_device *Device, + struct hv_storvsc_request *Request); + int (*OnHostReset)(struct hv_device *Device); }; struct storvsc_device_info { -- cgit v1.2.3