From bb546d0e930efa8b098d2fc8b5360fcc3eb92002 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 May 2011 19:35:15 -0700 Subject: [PATCH] Staging: hv: netvsc_drv: Move the dmi_check code to netvsc_drv_init() In preparation to eliminating netvsc_init(), move the dmi_check code to netvsc_drv_init(). 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 --- drivers/staging/hv/netvsc_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 2aa2733..5217021 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -458,6 +458,12 @@ static int netvsc_drv_init(void) struct hv_driver *drv = &netvsc_drv; int ret; + pr_info("initializing...."); + + if (!dmi_check_system(hv_netvsc_dmi_table)) + return -ENODEV; + + /* Callback to client driver to complete the initialization */ netvsc_initialize(drv); @@ -471,11 +477,6 @@ static int netvsc_drv_init(void) static int __init netvsc_init(void) { - pr_info("initializing...."); - - if (!dmi_check_system(hv_netvsc_dmi_table)) - return -ENODEV; - return netvsc_drv_init(); } -- 2.7.4