Changeset 52681 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Sep 10, 2014 4:01:06 PM (10 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: Linux: remove unused code for creating a device major.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -129 +129 @@
 static char                     g_szDbgLogDst[128];
 # endif
-#endif
-
-/** Our file node major id.
- * Either set dynamically at run time or statically at compile time. */
-#ifdef CONFIG_VBOXGUEST_MAJOR
-static unsigned int             g_iModuleMajor = CONFIG_VBOXGUEST_MAJOR;
-#else
-static unsigned int             g_iModuleMajor = 0;
-#endif
-#ifdef CONFIG_VBOXADD_MAJOR
-# error "CONFIG_VBOXADD_MAJOR -> CONFIG_VBOXGUEST_MAJOR"
 #endif
 
@@ -504 +493 @@
      * The full feature device node.
      */
-    if (g_iModuleMajor > 0)
-    {
-        rc = register_chrdev(g_iModuleMajor, DEVICE_NAME, &g_FileOps);
-        if (rc < 0)
-        {
-            LogRel((DEVICE_NAME ": register_chrdev failed: g_iModuleMajor: %d, rc: %d\n", g_iModuleMajor, rc));
-            return rc;
-        }
-    }
-    else
-    {
-        rc = misc_register(&g_MiscDevice);
-        if (rc)
-        {
-            LogRel((DEVICE_NAME ": misc_register failed for %s (rc=%d)\n", DEVICE_NAME, rc));
-            return rc;
-        }
+    rc = misc_register(&g_MiscDevice);
+    if (rc)
+    {
+        LogRel((DEVICE_NAME ": misc_register failed for %s (rc=%d)\n", DEVICE_NAME, rc));
+        return rc;
     }
 
@@ -530 +507 @@
     {
         LogRel((DEVICE_NAME ": misc_register failed for %s (rc=%d)\n", DEVICE_NAME_USER, rc));
-        if (g_iModuleMajor > 0)
-            unregister_chrdev(g_iModuleMajor, DEVICE_NAME);
-        else
-            misc_deregister(&g_MiscDevice);
+        misc_deregister(&g_MiscDevice);
         return rc;
     }
@@ -546 +520 @@
 static void vboxguestLinuxTermDeviceNodes(void)
 {
-    if (g_iModuleMajor > 0)
-        unregister_chrdev(g_iModuleMajor, DEVICE_NAME);
-    else
-        misc_deregister(&g_MiscDevice);
+    misc_deregister(&g_MiscDevice);
     misc_deregister(&g_MiscDeviceUser);
 }
@@ -653 +624 @@
                         {
                             /* some useful information for the user but don't show this on the console */
-                            LogRel((DEVICE_NAME ": major %d, IRQ %d, I/O port %RTiop, MMIO at %RHp (size 0x%x)\n",
-                                    g_iModuleMajor, g_pPciDev->irq, g_IOPortBase, g_MMIOPhysAddr, g_cbMMIO));
+                            LogRel((DEVICE_NAME ": misc device minor %d, IRQ %d, I/O port %RTiop, MMIO at %RHp (size 0x%x)\n",
+                                    g_MiscDevice.minor, g_pPciDev->irq, g_IOPortBase, g_MMIOPhysAddr, g_cbMMIO));
                             printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version "
                                    VBOX_VERSION_STRING " (interface " RT_XSTR(VMMDEV_VERSION) ")\n");