From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:55:17 +0000 (-0700) Subject: Staging: hv: netvsc_drv: Statically initialize probe/remove X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d48909703054bc5759dea5859b00325b3871210a;p=deliverable%2Flinux.git Staging: hv: netvsc_drv: Statically initialize probe/remove Statically initialize probe/remove. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 566865fd1237..c5e7b93692e0 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -440,7 +440,10 @@ static int netvsc_drv_exit_cb(struct device *dev, void *data) } /* The one and only one */ -static struct netvsc_driver netvsc_drv; +static struct netvsc_driver netvsc_drv = { + .base.probe = netvsc_probe, + .base.remove = netvsc_remove, +}; static void netvsc_drv_exit(void) { @@ -485,9 +488,6 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) drv->driver.name = net_drv_obj->base.name; - drv->probe = netvsc_probe; - drv->remove = netvsc_remove; - /* The driver belongs to vmbus */ ret = vmbus_child_driver_register(&drv->driver);