forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: hv: call VmbusInitialize directly from vmbus_bus_init()

Browse source 
No need to pass a function pointer to a function in the same file.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-12-02 12:04:00 -08:00
parent 36199a992a
commit 6c884555f2
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/hv/vmbus_api.h
View file

@ -115,7 +115,6 @@ struct hv_device {
void *Extension; void *Extension;
}; };
int VmbusInitialize(struct hv_driver *drv);
int vmbus_on_isr(struct hv_driver *drv); int vmbus_on_isr(struct hv_driver *drv);
void vmbus_on_msg_dpc(struct hv_driver *drv); void vmbus_on_msg_dpc(struct hv_driver *drv);
void vmbus_on_event_dpc(struct hv_driver *drv); void vmbus_on_event_dpc(struct hv_driver *drv);

8
drivers/staging/hv/vmbus_drv.c
View file

@ -298,7 +298,7 @@ int vmbus_on_isr(struct hv_driver *drv)
/* /*
* VmbusInitialize - Main entry point * VmbusInitialize - Main entry point
*/ */
int VmbusInitialize(struct hv_driver *driver) static int VmbusInitialize(struct hv_driver *driver)
{ {
int ret; int ret;
@ -491,7 +491,7 @@ static ssize_t vmbus_show_device_attr(struct device *dev,
* - setup the vmbus root device * - setup the vmbus root device
* - retrieve the channel offers * - retrieve the channel offers
*/ */
static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv)) static int vmbus_bus_init(void)
{ {
struct vmbus_driver_context *vmbus_drv_ctx = &g_vmbus_drv; struct vmbus_driver_context *vmbus_drv_ctx = &g_vmbus_drv;
struct hv_driver *driver = &g_vmbus_drv.drv_obj; struct hv_driver *driver = &g_vmbus_drv.drv_obj;
@ -500,7 +500,7 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
unsigned int vector; unsigned int vector;
/* Call to bus driver to initialize */ /* Call to bus driver to initialize */
ret = drv_init(driver); ret = VmbusInitialize(driver);
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(VMBUS_DRV, "Unable to initialize vmbus (%d)", ret); DPRINT_ERR(VMBUS_DRV, "Unable to initialize vmbus (%d)", ret);
goto cleanup; goto cleanup;
@ -1107,7 +1107,7 @@ static int __init vmbus_init(void)
if (!dmi_check_system(microsoft_hv_dmi_table)) if (!dmi_check_system(microsoft_hv_dmi_table))
return -ENODEV; return -ENODEV;
return vmbus_bus_init(VmbusInitialize); return vmbus_bus_init();
} }
static void __exit vmbus_exit(void) static void __exit vmbus_exit(void)