Changeset 21949 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Aug 3, 2009 6:42:45 PM (16 years ago)

Author:

vboxsync

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

50637

Message:

Linux host kernel module: adapted platform power management interface to Linux >= 2.6.30

File:

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

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

@@ -181 +181 @@
 #ifdef VBOX_WITH_SUSPEND_NOTIFICATION
 static int  VBoxDrvProbe(struct platform_device *pDev);
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+static int  VBoxDrvSuspend(struct device *pDev);
+static int  VBoxDrvResume(struct device *pDev);
+# else
 static int  VBoxDrvSuspend(struct platform_device *pDev, pm_message_t State);
 static int  VBoxDrvResume(struct platform_device *pDev);
+# endif
 static void VBoxDevRelease(struct device *pDev);
 #endif
@@ -214 +219 @@
 
 #ifdef VBOX_WITH_SUSPEND_NOTIFICATION
-static struct platform_driver gPlatformDriver =
-{
-    .probe = VBoxDrvProbe,
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+static struct dev_pm_ops gPlatformPMOps =
+{
     .suspend = VBoxDrvSuspend,
     .resume = VBoxDrvResume,
+};
+# endif
+
+static struct platform_driver gPlatformDriver =
+{
+    .probe = VBoxDrvProbe,
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+    .suspend = VBoxDrvSuspend,
+    .resume = VBoxDrvResume,
+# endif
     /** @todo .shutdown? */
     .driver =
     {
-        .name = "vboxdrv"
+        .name = "vboxdrv",
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+        .pm = &gPlatformPMOps,
+# endif
     }
 };
@@ -735 +753 @@
  * @param   State       message type, see Documentation/power/devices.txt.
  */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+static int VBoxDrvSuspend(struct device *pDev)
+# else
 static int VBoxDrvSuspend(struct platform_device *pDev, pm_message_t State)
+# endif
 {
     RTPowerSignalEvent(RTPOWEREVENT_SUSPEND);
@@ -746 +768 @@
  * @param   pDev        Pointer to the platform device.
  */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+static int VBoxDrvResume(struct device *pDev)
+# else
 static int VBoxDrvResume(struct platform_device *pDev)
+# endif
 {
     RTPowerSignalEvent(RTPOWEREVENT_RESUME);