VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / char / sonypi.c

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index a906dfa..28418d5 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -43,6 +43,8 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
 #include <linux/acpi.h>
+#include <linux/dmi.h>
+#include <linux/sysdev.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -602,44 +604,68 @@ struct miscdevice sonypi_misc_device = {
 };
 
 #ifdef CONFIG_PM
+static int old_camera_power;
+
+static int sonypi_suspend(struct sys_device *dev, u32 state) {
+       sonypi_call2(0x81, 0); /* make sure we don't get any more events */
+       if (camera) {
+               old_camera_power = sonypi_device.camera_power;
+               sonypi_camera_off();
+       }
+       if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
+               sonypi_type2_dis();
+       else
+               sonypi_type1_dis();
+       /* disable ACPI mode */
+       if (!SONYPI_ACPI_ACTIVE && fnkeyinit)
+               outb(0xf1, 0xb2);
+       return 0;
+}
+
+static int sonypi_resume(struct sys_device *dev) {
+       /* Enable ACPI mode to get Fn key events */
+       if (!SONYPI_ACPI_ACTIVE && fnkeyinit)
+               outb(0xf0, 0xb2);
+       if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
+               sonypi_type2_srs();
+       else
+               sonypi_type1_srs();
+       sonypi_call1(0x82);
+       sonypi_call2(0x81, 0xff);
+       if (compat)
+               sonypi_call1(0x92); 
+       else
+               sonypi_call1(0x82);
+       if (camera && old_camera_power)
+               sonypi_camera_on();
+       return 0;
+}
+
+/* Old PM scheme */
 static int sonypi_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data) {
-       static int old_camera_power;
 
        switch (rqst) {
-       case PM_SUSPEND:
-               sonypi_call2(0x81, 0); /* make sure we don't get any more events */
-               if (camera) {
-                       old_camera_power = sonypi_device.camera_power;
-                       sonypi_camera_off();
-               }
-               if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
-                       sonypi_type2_dis();
-               else
-                       sonypi_type1_dis();
-               /* disable ACPI mode */
-               if (!SONYPI_ACPI_ACTIVE && fnkeyinit)
-                       outb(0xf1, 0xb2);
-               break;
-       case PM_RESUME:
-               /* Enable ACPI mode to get Fn key events */
-               if (!SONYPI_ACPI_ACTIVE && fnkeyinit)
-                       outb(0xf0, 0xb2);
-               if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
-                       sonypi_type2_srs();
-               else
-                       sonypi_type1_srs();
-               sonypi_call1(0x82);
-               sonypi_call2(0x81, 0xff);
-               if (compat)
-                       sonypi_call1(0x92); 
-               else
-                       sonypi_call1(0x82);
-               if (camera && old_camera_power)
-                       sonypi_camera_on();
-               break;
+               case PM_SUSPEND:
+                       sonypi_suspend(NULL, 0);
+                       break;
+               case PM_RESUME:
+                       sonypi_resume(NULL);
+                       break;
        }
        return 0;
 }
+
+/* New PM scheme (device model) */
+static struct sysdev_class sonypi_sysclass = {
+       set_kset_name("sonypi"),
+       .suspend = sonypi_suspend,
+       .resume = sonypi_resume,
+};
+
+static struct sys_device sonypi_sysdev = {
+       .id = 0,
+       .cls = &sonypi_sysclass,
+};
 #endif
 
 static int __devinit sonypi_probe(struct pci_dev *pcidev) {
@@ -734,6 +760,21 @@ static int __devinit sonypi_probe(struct pci_dev *pcidev) {
                goto out3;
        }
 
+#ifdef CONFIG_PM
+       sonypi_device.pm = pm_register(PM_PCI_DEV, 0, sonypi_pm_callback);
+
+       if (sysdev_class_register(&sonypi_sysclass) != 0) {
+               printk(KERN_ERR "sonypi: sysdev_class_register failed\n");
+               ret = -ENODEV;
+               goto out4;
+       }
+       if (sysdev_register(&sonypi_sysdev) != 0) {
+               printk(KERN_ERR "sonypi: sysdev_register failed\n");
+               ret = -ENODEV;
+               goto out5;
+       }
+#endif
+
        /* Enable ACPI mode to get Fn key events */
        if (!SONYPI_ACPI_ACTIVE && fnkeyinit)
                outb(0xf0, 0xb2);
@@ -743,7 +784,7 @@ static int __devinit sonypi_probe(struct pci_dev *pcidev) {
               SONYPI_DRIVER_MINORVERSION);
        printk(KERN_INFO "sonypi: detected %s model, "
               "verbose = %d, fnkeyinit = %s, camera = %s, "
-              "compat = %s, mask = 0x%08lx, useinput = %s\n",
+              "compat = %s, mask = 0x%08lx, useinput = %s, acpi = %s\n",
               (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE1) ?
                        "type1" : "type2",
               verbose,
@@ -751,10 +792,12 @@ static int __devinit sonypi_probe(struct pci_dev *pcidev) {
               camera ? "on" : "off",
               compat ? "on" : "off",
               mask,
-              useinput ? "on" : "off");
+              useinput ? "on" : "off",
+              SONYPI_ACPI_ACTIVE ? "on" : "off");
        printk(KERN_INFO "sonypi: enabled at irq=%d, port1=0x%x, port2=0x%x\n",
               sonypi_device.irq, 
               sonypi_device.ioport1, sonypi_device.ioport2);
+
        if (minor == -1)
                printk(KERN_INFO "sonypi: device allocated minor is %d\n",
                       sonypi_misc_device.minor);
@@ -776,12 +819,14 @@ static int __devinit sonypi_probe(struct pci_dev *pcidev) {
        }
 #endif /* SONYPI_USE_INPUT */
 
-#ifdef CONFIG_PM
-       sonypi_device.pm = pm_register(PM_PCI_DEV, 0, sonypi_pm_callback);
-#endif
-
        return 0;
 
+#ifdef CONFIG_PM
+out5:
+       sysdev_class_unregister(&sonypi_sysclass);
+out4:
+       free_irq(sonypi_device.irq, sonypi_irq);
+#endif
 out3:
        release_region(sonypi_device.ioport1, sonypi_device.region_size);
 out2:
@@ -794,6 +839,9 @@ static void __devexit sonypi_remove(void) {
 
 #ifdef CONFIG_PM
        pm_unregister(sonypi_device.pm);
+
+       sysdev_unregister(&sonypi_sysdev);
+       sysdev_class_unregister(&sonypi_sysclass);
 #endif
 
        sonypi_call2(0x81, 0); /* make sure we don't get any more events */
@@ -820,10 +868,28 @@ static void __devexit sonypi_remove(void) {
        printk(KERN_INFO "sonypi: removed.\n");
 }
 
-static int __init sonypi_init_module(void) {
-       struct pci_dev *pcidev = NULL;
+static struct dmi_system_id __initdata sonypi_dmi_table[] = {
+       {
+               .ident = "Sony Vaio",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "PCG-"),
+               },
+       },
+       {
+               .ident = "Sony Vaio",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "VGN-"),
+               },
+       },
+       { }
+};
 
-       if (is_sony_vaio_laptop) {
+static int __init sonypi_init_module(void)
+{
+       struct pci_dev *pcidev = NULL;
+       if (dmi_check_system(sonypi_dmi_table)) {
                pcidev = pci_find_device(PCI_VENDOR_ID_INTEL, 
                                         PCI_DEVICE_ID_INTEL_82371AB_3, 
                                         NULL);