From: K. Y. Srinivasan Date: Fri, 13 May 2011 02:35:15 +0000 (-0700) Subject: Staging: hv: netvsc_drv: Move the dmi_check code to netvsc_drv_init() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb546d0e930efa8b098d2fc8b5360fcc3eb92002;p=mv-sheeva.git 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 --- diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 2aa273380f1..5217021d6e1 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(); }