Staging: hv: remove function pointer typedefs from vmbus.h
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 2 Sep 2009 18:53:59 +0000 (11:53 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:02:03 +0000 (12:02 -0700)
It's amazing the hoops that people go through to make code work
when they don't opensource the whole thing.  Passing these types
of function pointers around for no good reason is a mess, this needs
to be unwound as everything is now in the open.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/blkvsc_drv.c
drivers/staging/hv/netvsc_drv.c
drivers/staging/hv/storvsc_drv.c
drivers/staging/hv/vmbus.h
drivers/staging/hv/vmbus_drv.c

index 7c383adbce299d8d45c7ece2426f3b283b03272d..99c49261a8b4f125b9c05b8fa8cf1604ea70358b 100644 (file)
@@ -165,7 +165,7 @@ static struct block_device_operations block_ops = {
 /**
  * blkvsc_drv_init -  BlkVsc driver initialization.
  */
-static int blkvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
+static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
 {
        struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv.drv_obj;
        struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;
@@ -178,7 +178,7 @@ static int blkvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
        storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;
 
        /* Callback to client driver to complete the initialization */
-       pfn_drv_init(&storvsc_drv_obj->Base);
+       drv_init(&storvsc_drv_obj->Base);
 
        drv_ctx->driver.name = storvsc_drv_obj->Base.name;
        memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType,
index 70f66cb0ef00a640a59d6e1b4896e9d8983d3974..3192d50f72511a897627191babeb5e7b6c97e3fd 100644 (file)
@@ -559,7 +559,7 @@ static void netvsc_drv_exit(void)
        return;
 }
 
-static int netvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
+static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
 {
        struct netvsc_driver *net_drv_obj = &g_netvsc_drv.drv_obj;
        struct driver_context *drv_ctx = &g_netvsc_drv.drv_ctx;
@@ -574,7 +574,7 @@ static int netvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
        net_drv_obj->OnLinkStatusChanged = netvsc_linkstatus_callback;
 
        /* Callback to client driver to complete the initialization */
-       pfn_drv_init(&net_drv_obj->Base);
+       drv_init(&net_drv_obj->Base);
 
        drv_ctx->driver.name = net_drv_obj->Base.name;
        memcpy(&drv_ctx->class_id, &net_drv_obj->Base.deviceType,
index ba15f54a315c3bb50b2dc0b4c35d100602bc16ec..d49dc21d4cb4a4117c570e5818dee8b2ec5a19eb 100644 (file)
@@ -137,7 +137,7 @@ static struct scsi_host_template scsi_driver = {
 /**
  * storvsc_drv_init - StorVsc driver initialization.
  */
-static int storvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
+static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
 {
        int ret;
        struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj;
@@ -151,7 +151,7 @@ static int storvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
        storvsc_drv_obj->OnHostRescan = storvsc_host_rescan;
 
        /* Callback to client driver to complete the initialization */
-       pfn_drv_init(&storvsc_drv_obj->Base);
+       drv_init(&storvsc_drv_obj->Base);
 
        DPRINT_INFO(STORVSC_DRV,
                    "request extension size %u, max outstanding reqs %u",
index 045483bb73014ac7ecbbac33c0259f52a55d00c5..ae0a896eb39258032ac3ac25fd8843036011ea6e 100644 (file)
 #define _VMBUS_H_
 
 #include <linux/device.h>
-
 #include "VmbusApi.h"
 
-typedef int (*PFN_DRIVERINITIALIZE)(struct hv_driver *drv);
-typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv);
-
 struct driver_context {
        struct hv_guid class_id;
 
index b0d2481f5440489e61d849f8510cc7ad31eaf9c1..582318f10222160a9a9615368c4cff1fcf87b8cf 100644 (file)
@@ -241,7 +241,7 @@ static ssize_t vmbus_show_device_attr(struct device *dev,
  *     - setup the vmbus root device
  *     - retrieve the channel offers
  */
-static int vmbus_bus_init(PFN_DRIVERINITIALIZE pfn_drv_init)
+static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
 {
        struct vmbus_driver_context *vmbus_drv_ctx = &g_vmbus_drv;
        struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
@@ -261,7 +261,7 @@ static int vmbus_bus_init(PFN_DRIVERINITIALIZE pfn_drv_init)
        vmbus_drv_obj->OnChildDeviceRemove = vmbus_child_device_unregister;
 
        /* Call to bus driver to initialize */
-       ret = pfn_drv_init(&vmbus_drv_obj->Base);
+       ret = drv_init(&vmbus_drv_obj->Base);
        if (ret != 0) {
                DPRINT_ERR(VMBUS_DRV, "Unable to initialize vmbus (%d)", ret);
                goto cleanup;