Commit b7fc147b authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

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: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarMike Sterling <mike.sterling@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent adde2487
...@@ -47,7 +47,6 @@ struct hv_bus { ...@@ -47,7 +47,6 @@ struct hv_bus {
struct tasklet_struct event_dpc; 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_probe(struct device *device);
static int vmbus_remove(struct device *device); static int vmbus_remove(struct device *device);
static void vmbus_shutdown(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) ...@@ -172,6 +171,31 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
return 0; 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 */ /* The one and only one */
static struct hv_bus hv_bus = { static struct hv_bus hv_bus = {
.bus.name = "vmbus", .bus.name = "vmbus",
...@@ -700,29 +724,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj) ...@@ -700,29 +724,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj)
&device_obj->device); &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() * vmbus_probe_failed_cb - Callback when a driver probe failed in vmbus_probe()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment