Staging: hv: Get rid of the forward declaration for vmbus_match

Get rid of the forward declaration of vmbus_match by moving
the code around.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 5243d9802f7239999985e70a6cd8264ee66ab8ac..5dcfd9854921f4b05eb347cbc1f0f4e22839d2c1 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -47,7 +47,6 @@ struct hv_bus {
        struct tasklet_struct event_dpc;
 };
 
-static int vmbus_match(struct device *device, struct device_driver *driver);
 static int vmbus_probe(struct device *device);
 static int vmbus_remove(struct device *device);
 static void vmbus_shutdown(struct device *device);
@@ -172,6 +171,31 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
        return 0;
 }
 
+
+/*
+ * vmbus_match - Attempt to match the specified device to the specified driver
+ */
+static int vmbus_match(struct device *device, struct device_driver *driver)
+{
+       int match = 0;
+       struct hv_driver *drv = drv_to_hv_drv(driver);
+       struct hv_device *device_ctx = device_to_hv_device(device);
+
+       /* We found our driver ? */
+       if (memcmp(&device_ctx->dev_type, &drv->dev_type,
+                  sizeof(struct hv_guid)) == 0) {
+
+               device_ctx->drv = drv->priv;
+               DPRINT_INFO(VMBUS_DRV,
+                           "device object (%p) set to driver object (%p)",
+                           &device_ctx,
+                           device_ctx->drv);
+
+               match = 1;
+       }
+       return match;
+}
+
 /* The one and only one */
 static struct hv_bus  hv_bus = {
        .bus.name =             "vmbus",
@@ -700,29 +724,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj)
                    &device_obj->device);
 }
 
-/*
- * vmbus_match - Attempt to match the specified device to the specified driver
- */
-static int vmbus_match(struct device *device, struct device_driver *driver)
-{
-       int match = 0;
-       struct hv_driver *drv = drv_to_hv_drv(driver);
-       struct hv_device *device_ctx = device_to_hv_device(device);
-
-       /* We found our driver ? */
-       if (memcmp(&device_ctx->dev_type, &drv->dev_type,
-                  sizeof(struct hv_guid)) == 0) {
-
-               device_ctx->drv = drv->priv;
-               DPRINT_INFO(VMBUS_DRV,
-                           "device object (%p) set to driver object (%p)",
-                           &device_ctx,
-                           device_ctx->drv);
-
-               match = 1;
-       }
-       return match;
-}
 
 /*
  * vmbus_probe_failed_cb - Callback when a driver probe failed in vmbus_probe()