From e43bbbb370215b41870a57531a424036510b90dd Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 15 Mar 2011 15:03:38 -0700 Subject: [PATCH] --- yaml --- r: 248908 b: refs/heads/master c: b7fc147bd8732b54019e52af8f923cecd023c711 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 49 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 74b29585d8d2..3015007b0048 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adde2487d306a0153856cb0a777528ac1f19fa59 +refs/heads/master: b7fc147bd8732b54019e52af8f923cecd023c711 diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index 5243d9802f72..5dcfd9854921 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/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()