Changeset 55436 in vbox for trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

Timestamp:

Apr 27, 2015 9:13:02 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99782

Message:

Reverted bad commit r99781.

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (7 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -48 +48 @@
 # include <iprt/power.h>
 # define VBOX_WITH_SUSPEND_NOTIFICATION
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
-#  define VBOX_WITH_PRE_SUSPEND_NOTIFICATION
-# endif
 #endif
 
@@ -62 +59 @@
 #ifdef VBOX_WITH_SUSPEND_NOTIFICATION
 # include <linux/platform_device.h>
-#endif
-#ifdef VBOX_WITH_PRE_SUSPEND_NOTIFICATION
-# include <linux/suspend.h>
-# include <linux/notifier.h>
 #endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) && defined(SUPDRV_WITH_MSR_PROBER)
@@ -129 +122 @@
 # endif
 static void VBoxDevRelease(struct device *pDev);
-# ifdef VBOX_WITH_PRE_SUSPEND_NOTIFICATION
-static int VBoxDrvPowerNotificationCallback(struct notifier_block *, unsigned long, void *);
-# endif
 #endif
 
@@ -280 +270 @@
     }
 };
-
-# ifdef VBOX_WITH_PRE_SUSPEND_NOTIFICATION
-static struct notifier_block *g_pNotifier;
-# endif /* VBOX_WITH_PRE_SUSPEND_NOTIFICATION */
 #endif /* VBOX_WITH_SUSPEND_NOTIFICATION */
 
@@ -432 +418 @@
 #endif
                     {
-# ifdef VBOX_WITH_PRE_SUSPEND_NOTIFICATION
-                        size_t const cbNotifier = sizeof(*g_pNotifier);
-                        g_pNotifier = RTMemAllocZ(cbNotifier);
-                        if (g_pNotifier)
-                        {
-                            g_pNotifier->notifier_call = VBoxDrvPowerNotificationCallback;
-                            g_pNotifier->priority = 0;
-                            rc = register_pm_notifier(g_pNotifier);
-                            if (!rc)
-                                printk(KERN_INFO "vboxdrv: Successfully registered power notifier\n");
-                            else
-                            {
-                                printk(KERN_INFO "vboxdrv: Failed to register power notifier! rc=%d\n", rc);
-                                rc = 0;
-                            }
-                        }
-                        else
-                            printk(KERN_INFO "vboxdrv: Failed to alloc %lu bytes for power notifier\n", cbNotifier);
-# endif
-
                         printk(KERN_INFO "vboxdrv: TSC mode is %s, tentative frequency %llu Hz\n",
                                SUPGetGIPModeName(g_DevExt.pGip), g_DevExt.pGip->u64CpuHz);
@@ -505 +471 @@
     platform_device_unregister(&gPlatformDevice);
     platform_driver_unregister(&gPlatformDriver);
-# ifdef VBOX_WITH_PRE_SUSPEND_NOTIFICATION
-    if (g_pNotifier)
-    {
-        unregister_pm_notifier(g_pNotifier);
-        g_pNotifier = NULL;
-    }
-# endif
 #endif
 
@@ -675 +634 @@
 #endif /* VBOX_WITH_SUSPEND_NOTIFICATION */
 
-
-#ifdef VBOX_WITH_PRE_SUSPEND_NOTIFICATION
-static int VBoxDrvPowerNotificationCallback(struct notifier_block *pNotifier, unsigned long uEvent, void *pvUnused)
-{
-    NOREF(pvUnused);
-    if (uEvent == PM_SUSPEND_PREPARE)
-        RTPowerSignalEvent(RTPOWEREVENT_PRE_SUSPEND);
-    /* The remaining events are taken care by VBoxDrvSuspend() and VboxDrvResume() hooks. */
-    return NOTIFY_DONE;
-}
-#endif
 
 /**