Skip to content

Commit

Permalink
Staging: hv: Get rid of the forward declaration for vmbus_match
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent adde248 commit b7fc147
Showing 1 changed file with 25 additions and 24 deletions.
49 changes: 25 additions & 24 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit b7fc147

Please sign in to comment.